[Analyzer] Fix the Z3 lit test config

[vlad.tsyrklevich]

Summary

The '%analyze' extra_args config argument seems to have been erroneously
deleted in r315627 disabling Z3 tests for the clang analyzer. Add the
flag back.

[george.karpenkov]

LGTM, but could you clarify what was disabled? Tests for the Z3 solver as done by @ddcc ?

Also, I trust that all tests still pass?

[vlad.tsyrklevich]

In D47722#1121385, @george.karpenkov wrote:

LGTM, but could you clarify what was disabled? Tests for the Z3 solver as done by @ddcc ?

llvm-lit would run all analyzer tests (at least those using RUN: %clang_analyzer_cc1) twice when Z3 was enabled, once with and without Z3. It did so by substituting %analyze for the Z3 CM params, so when %analyze was removed llvm-lit just ran tests twice with the range CM http://llvm-cs.pcc.me.uk/tools/clang/test/Analysis/analyzer_test.py#38

Also, I trust that all tests still pass?

Almost, the fix-ups were submitted in https://reviews.llvm.org/D47726

[george.karpenkov]

llvm-lit would run all analyzer tests (at least those using RUN: %clang_analyzer_cc1) twice when Z3 was enabled, once with and without Z3

Right, and that sounds like a bad idea, because you might have Z3 configured, but at the same time you might not want to run every test with it every time.
I think there should be a separate target.

llvm/trunk/utils/lit/lit/llvm/config.py

def use_clang(self, required=True):
         self.config.substitutions.append(
             ('%llvmshlibdir', self.config.llvm_shlib_dir))
         self.config.substitutions.append(
             ('%pluginext', self.config.llvm_plugin_ext))
 
         builtin_include_dir = self.get_clang_builtin_include_dir(self.config.clang)
         tool_substitutions = [
             ToolSubst('%clang', command=self.config.clang),
-            ToolSubst('%clang_analyze_cc1', command='%clang_cc1', extra_args=['-analyze']),
+            ToolSubst('%clang_analyze_cc1', command='%clang_cc1', extra_args=['-analyze', '%analyze']),
             ToolSubst('%clang_cc1', command=self.config.clang, extra_args=['-cc1', '-internal-isystem', builtin_include_dir, '-nostdsysteminc']),
             ToolSubst('%clang_cpp', command=self.config.clang, extra_args=['--driver-mode=cpp']),
             ToolSubst('%clang_cl', command=self.config.clang, extra_args=['--driver-mode=cl']),
             ToolSubst('%clangxx', command=self.config.clang, extra_args=['--driver-mode=g++']),
             ]
         self.add_tool_substitutions(tool_substitutions)
 
         self.config.substitutions.append(('%itanium_abi_triple',