[dexter] Fix failing regression tests

[Orlando]

Summary

D109833 makes the flags --builder and --binary mutually exclusive, which
caused some regression tests to fail. Add a new substitution
%dexter_regression_base that doesn't include the --builder, --cflags or
--ldflags flags and use that for tests that use the --binary flag.

[jmorse]

This makes sense -- these tests are addressing a different part of the tool, the same way we have %clang_cc1 and the like.

cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_file/precompiled_binary/commands.dex

 # Purpose:
 #    Check that \DexDeclareFile's file declaration can reference source files
 #    in a precompiled binary.
 #
 # UNSUPPORTED: system-darwin
 #
 # RUN: %clang %S/test.cpp -O0 -g -o %t
-# RUN: %dexter_regression_test --binary %t %s | FileCheck %s
+# RUN: %dexter_regression_base --binary %t %s | FileCheck %s
 # CHECK: commands.dex
 #
 # test.cpp
 # 1. int main() {
 # 2.   int result = 0;
 # 3.   return result;
 # 4. }
 
 DexDeclareFile('test.cpp')
 DexExpectWatchValue('result', 0, on_line=3)

cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_file/precompiled_binary_different_dir/dex_commands/commands.dex

 # Purpose:
 #    Check that \DexDeclareFile's file declaration can reference source files
 #    not included in the test directory
 #
 # UNSUPPORTED: system-darwin
 #
 # RUN: %clang %S/../source/test.cpp -O0 -g -o %t
-# RUN: %dexter_regression_test --binary %t %s | FileCheck %s
+# RUN: %dexter_regression_base --binary %t %s | FileCheck %s
 # RUN: rm %t
 # CHECK: commands.dex
 #
 # test.cpp
 # 1. int main() {
 # 2.   int result = 0;
 # 3.   return result;
 # 4. }
 
 DexDeclareFile('../source/test.cpp')
 DexExpectWatchValue('result', 0, on_line=3)

cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_file/precompiled_binary_different_dir/dex_commands/source_root_dir.dex

 ## Purpose:
 ##    Check that \DexDeclareFile's file declaration can be made relative to the
 ##    --source-root-dir path.
 
 # REQUIRES: lldb
 # UNSUPPORTED: system-darwin
 
 # RUN: %clang %S/../source/test.cpp -O0 -g -o %t
-# RUN: %dexter_regression_test --binary %t \
+# RUN: %dexter_regression_base --binary %t \
 # RUN:   --source-root-dir="%S/../source" -- %s | FileCheck %s
 # RUN: rm %t
 
 # CHECK: source_root_dir.dex: (1.0000)
 
 ## ../source/test.cpp
 ## 1. int main() {
 ## 2.   int result = 0;
 ## 3.   return result;
 ## 4. }
 
 ## test.cpp is found in ../source, which we set as the source-root-dir.
 DexDeclareFile('test.cpp')
 DexExpectWatchValue('result', 0, on_line=3)

cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_file/windows_noncanonical_path/test.dex

 # Purpose:
 #    Check that non-canonical paths resolve correctly on Windows.
 #
 # REQUIRES: system-windows
 #
 # RUN: %clang "%S/source/test file.cpp" -O0 -g -o %t
-# RUN: %dexter_regression_test --binary %t %s | FileCheck %s
+# RUN: %dexter_regression_base --binary %t %s | FileCheck %s
 # CHECK: test.dex
 #
 # ./source/test file.cpp
 # 1 int main(const int argc, const char * argv[]) {
 # 2 int result = argc;
 # 3 return result;
 # 4 }
 
 DexDeclareFile('./sOuRce\\test filE.cpp')
 DexExpectWatchValue('result', 1, on_line=3)

cross-project-tests/lit.cfg.py

 else:
   dexter_regression_test_builder = '--builder clang'
   dexter_regression_test_debugger = "--debugger lldb"
   dexter_regression_test_cflags = '--cflags "-O0 -glldb"'
   dexter_regression_test_ldflags = ''
 
 # Typical command would take the form:
 # ./path_to_py/python.exe ./path_to_dex/dexter.py test --fail-lt 1.0 -w --builder clang --debugger lldb --cflags '-O0 -g'
-dexter_regression_test_command = ' '.join(
+# Exclude build flags for %dexter_regression_base.
+dexter_regression_test_base = ' '.join(
   # "python", "dexter.py", test, fail_mode, builder, debugger, cflags, ldflags
   ['"{}"'.format(sys.executable),
   '"{}"'.format(dexter_path),
   'test',
   '--fail-lt 1.0 -w',
+  dexter_regression_test_debugger])
+tools.append(ToolSubst('%dexter_regression_base', dexter_regression_test_base))
+
+# Include build flags for %dexter_regression_test.
+dexter_regression_test_build = ' '.join([
+  dexter_regression_test_base,
   dexter_regression_test_builder,
-  dexter_regression_test_debugger,
   dexter_regression_test_cflags,
   dexter_regression_test_ldflags])
-
-tools.append(ToolSubst('%dexter_regression_test', dexter_regression_test_command))
+tools.append(ToolSubst('%dexter_regression_test', dexter_regression_test_build))
 
 tool_dirs = [config.llvm_tools_dir]
 
 llvm_config.add_tool_substitutions(tools, tool_dirs)
 
 lit.util.usePlatformSdkOnDarwin(config, lit_config)
 
 if platform.system() == 'Darwin':