[Dexter] Remove false requirement of lldb for dexter regression tests on Windows

[Orlando]

Summary

Not quite NFC because a little work was required to configure some tests to run
on Windows at all.

Before this patch on Windows:

$ llvm-lit cross-project-tests\debuginfo-tests\dexter\feature-tests
   Unsupported: 49
   Passed     : 23

After this patch on Windows:

$ llvm-lit cross-project-tests\debuginfo-tests\dexter\feature-tests
   Unsupported      : 27
   Passed           : 39
   Expectedly failed:  6

There are 3 main changes here. The first is to add a few more substitutions in
cross-project-tests/lit.cfg.py so that tests need to use specific flags can
still use the dexter regression test defaults for the native platform. These
are:

%dexter_regression_test_debugger
%dexter_regression_test_builder
%dexter_regression_test_cflags
%dexter_regression_test_ldflags

Tests that now use these options and therefore can be run on Windows too
(though the second is still failing for unknown reasons):

cross-project-tests/debuginfo-tests/dexte/feature_tests
    /subtools/clang-opt-bisect/clang-opt-bisect.cpp
    /subtools/test/source-root-dir.cpp

The second change is to remove spurious REQUIRES: system-linux, lldb and
UNSUPPORTED: system-windows directives, and make changes to lit.local.cfg
files that have the same effect. I've also added comments to the genuine
REQUIRES, UNSUPPORTED, and XFAIL directives so it's easier to understand
requirements at a glance. The most common reason for a test to not be supported
on Windows is that it uses DexLimitSteps, DexDeclareAddress, or DexCommandLine,
none of which are supported in the dbgeng driver.

There are two failures on Windows that were previously hidden, which I've
XFAILed:

cross-project-tests/debuginfo-tests/dexter/feature_tests
    /commands/perfect/dex_finish_test/default_conditional.cpp
    /commands/perfect/dex_finish_test/default_conditional_hit_count.cpp

And two that were easy to fix:

cross-project-tests/debuginfo-tests/dexter/feature_tests
    /commands/perfect/dex_finish_test/default_simple.cpp
    /commands/perfect/dex_finish_test/default_hit_count.cpp

Lastly, I've set three directories as unsupported.

cross-project-tests/debuginfo-tests/dexter/feature_tests
    /commands/perfect/limit_steps
    /commands/perfect/dex_declare_address
    /commands/perfect/dex_declare_file

The first two are unsupported on Windows because they contains tests for the
DexLimitSteps and DexDeclareAddress commands which aren't supported in the
dbgeng driver. The third is unsupported on all platforms as the tests involve
invoking clang directly, which isn't currently a supported way of building
tests for dexter in lit (it can cause problems for cross compilers that can
target the host, as the tests use the default triple and linker, which may
be aligned for the default target, not host).

Tested on Windows and Linux.

[StephenTozer]

LGTM, with a couple of nits - good work!

cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_file/lit.local.cfg

2

substituion -> substitution

cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/clang-opt-bisect/clang-opt-bisect.cpp

8–9

Very tiny nit, but is there a reason for the "=" on these lines and not the others?

cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_limit_steps_no_values.cpp

10

Nit, keep the newline unless there's an important reason for it.

[jmorse]

SGTM with a question inline.

cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_file/lit.local.cfg

2–4

To be clear, we're making this unsupported everywhere because it won't work on our public buildbot, yes? This seems like a reasonable trade-off to me (some public coverage now vs no public coverage now), just checking the reasoning.

[Orlando]

Folded nit-fixes into the commit, thanks both.

cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_file/lit.local.cfg

2–4

Yep, that's right

cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/missing_dex_address.cpp

 // Purpose:
 //      Test that when a \DexDeclareAddress never resolves to a value, it is
 //      counted as a missing value in any \DexExpectWatchValues.
 //
-// REQUIRES: system-linux
+// The dbgeng driver doesn't support \DexDeclareAddress yet.
+// UNSUPPORTED: system-windows
 //
 // RUN: not %dexter_regression_test -- %s | FileCheck %s
 // CHECK: missing_dex_address.cpp
 
 int main() {
     int *x = nullptr;
     x = new int(5); // DexLabel('start_line')
     if (false) {
         (void)0; // DexLabel('unreachable')
     }
     delete x; // DexLabel('end_line')
 }
 
 // DexDeclareAddress('x', 'x', on_line=ref('unreachable'))
 // DexExpectWatchValue('x', 0, address('x'), from_line=ref('start_line'), to_line=ref('end_line'))

cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/command_line.c

-// UNSUPPORTED: dbgeng
+// The dbgeng driver doesn't support \DexCommandLine yet.
+// UNSUPPORTED: system-windows
 //
 // RUN: %dexter_regression_test -- %s | FileCheck %s
 // CHECK: command_line.c:
 
 int main(int argc, const char **argv) {
   if (argc == 4)
     return 0; // DexLabel('retline')
 
   return 1; // DexUnreachable()
 }
 
 // DexExpectWatchValue('argc', '4', on_line=ref('retline'))
 
 // Three args will be appended to the 'default' argument.
 // DexCommandLine(['a', 'b', 'c'])

cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_address/address_after_ref.cpp

 // Purpose:
 //      Test that a \DexDeclareAddress value can have its value defined after
 //      the first reference to that value.
 //
-// REQUIRES: system-linux
-//
 // RUN: %dexter_regression_test -- %s | FileCheck %s
 // CHECK: address_after_ref.cpp
 
 int main() {
     int *x = new int(5);
     int *y = x; // DexLabel('first_line')
     delete x; // DexLabel('last_line')
 }
 
 // DexDeclareAddress('y', 'y', on_line=ref('last_line'))
 // DexExpectWatchValue('x', address('y'), on_line=ref('first_line'))

cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_address/address_hit_count.cpp

 // Purpose:
 //      Test that a \DexDeclareAddress command can be passed 'hit_count' as an
 //      optional keyword argument that captures the value of the given
 //      expression after the target line has been stepped on a given number of
 //      times.
 //
-// REQUIRES: system-linux
-//
 // RUN: %dexter_regression_test -- %s | FileCheck %s
 // CHECK: address_hit_count.cpp
 
 int main() {
     int *x = new int[3];
     for (int *y = x; y < x + 3; ++y)
       *y = 0; // DexLabel('test_line')
     delete x;
 }
 
 // DexDeclareAddress('y', 'y', on_line=ref('test_line'), hit_count=2)
 // DexExpectWatchValue('y', address('y', -8), address('y', -4), address('y'), on_line=ref('test_line'))

cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_address/expression_address.cpp

 // Purpose:
 //      Test that a \DexDeclareAddress value can be used to compare the
 //      addresses of two local variables that refer to the same address.
 //
-// REQUIRES: system-linux
-//
 // RUN: %dexter_regression_test -- %s | FileCheck %s
 // CHECK: expression_address.cpp
 
 int main() {
     int x = 5;
     int &y = x;
     x = 3; // DexLabel('test_line')
 }
 
 // DexDeclareAddress('x_addr', '&x', on_line=ref('test_line'))
 // DexExpectWatchValue('&x', address('x_addr'), on_line=ref('test_line'))
 // DexExpectWatchValue('&y', address('x_addr'), on_line=ref('test_line'))

cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_address/identical_address.cpp

 // Purpose:
 //      Test that a \DexDeclareAddress value can be used to compare two equal
 //      pointer variables.
 //
-// REQUIRES: system-linux
-//
 // RUN: %dexter_regression_test -- %s | FileCheck %s
 // CHECK: identical_address.cpp
 
 int main() {
     int *x = new int(5);
     int *y = x;
     delete x; // DexLabel('test_line')
 }
 
 // DexDeclareAddress('x', 'x', on_line=ref('test_line'))
 // DexExpectWatchValue('x', address('x'), on_line=ref('test_line'))
 // DexExpectWatchValue('y', address('x'), on_line=ref('test_line'))

cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_address/lit.local.cfg

+# The dbgeng driver doesn't support DexDeclareAddress yet.
+if config.is_msvc:
+    config.unsupported = True

cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_address/multiple_address.cpp

 // Purpose:
 //      Test that multiple \DexDeclareAddress references that point to different
 //      addresses can be used within a single \DexExpectWatchValue.
 //
-// REQUIRES: system-linux
-//
 // RUN: %dexter_regression_test -- %s | FileCheck %s
 // CHECK: multiple_address.cpp
 
 int main() {
     int *x = new int(5);
     int *y = new int(4);
     int *z = x;
     *z = 0; // DexLabel('start_line')

cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_address/offset_address.cpp

 // Purpose:
 //      Test that a \DexDeclareAddress value can be used to compare two pointer
 //      variables that have a fixed offset between them.
 //
-// REQUIRES: system-linux
-//
 // RUN: %dexter_regression_test -- %s | FileCheck %s
 // CHECK: offset_address.cpp
 
 int main() {
     int *x = new int[5];
     int *y = x + 3;
     delete x; // DexLabel('test_line')
 }
 
 // DexDeclareAddress('x', 'x', on_line=ref('test_line'))
 // DexExpectWatchValue('x', address('x'), on_line=ref('test_line'))
 // DexExpectWatchValue('y', address('x', 12), on_line=ref('test_line'))

cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_address/self_comparison.cpp

 // Purpose:
 //      Test that a \DexDeclareAddress value can be used to check the change in
 //      value of a variable over time, relative to its initial value.
 //
-// REQUIRES: system-linux
-//
 // RUN: %dexter_regression_test -- %s | FileCheck %s
 // CHECK: self_comparison.cpp
 
 int main() {
     int *x = new int[3];
     for (int *y = x; y < x + 3; ++y)
       *y = 0; // DexLabel('test_line')
     delete x;
 }
 
 // DexDeclareAddress('y', 'y', on_line=ref('test_line'))
 // DexExpectWatchValue('y', address('y'), address('y', 4), address('y', 8), on_line=ref('test_line'))

cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_file/lit.local.cfg

+# FIXME: These tests compile code with %clang substitution which needs to run
+# natively but doesn't specify target triple (i.e. default triple is used).
+config.unsupported = True

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_base --binary %t \
 # RUN:   --source-root-dir="%S/../source" -- %s | FileCheck %s
 # RUN: rm %t
 
 # CHECK: source_root_dir.dex: (1.0000)

cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/default_conditional.cpp

+// FIXME: Feature appears to be broken on Windows with dbgeng.
+// XFAIL: system-windows
 // Purpose:
 //      Test that \DexFinishTest can be used with a condition, so the test exits
 //      when the line referenced by \DexFinishTest is stepped on and the given
 //      condition (x == 5) is satisfied.
 //      Tests using the default controller (no \DexLimitSteps).
 //
-// REQUIRES: system-linux
-//
 // RUN: %dexter_regression_test -- %s | FileCheck %s
 // CHECK: default_conditional.cpp
 
 int main() {
     for (int x = 0; x < 10; ++x)
         (void)0; // DexLabel('finish_line')
 }
 
 // DexFinishTest('x', 5, on_line=ref('finish_line'))
-// DexExpectWatchValue('x', 0, 1, 2, 3, 4, 5)
+// DexExpectWatchValue('x', 0, 1, 2, 3, 4, 5, on_line=ref('finish_line'))

cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/default_conditional_hit_count.cpp

+// FIXME: Feature appears to be broken on Windows with dbgeng.
+// XFAIL: system-windows
 // Purpose:
 //      Test that \DexFinishTest can be used with a combination of a hit_count
 //      and a condition, so that the test exits after the line referenced
 //      by \DexFinishTest is stepped on while the condition (x == 2) is true a
 //      given number of times.
 //      Tests using the default controller (no \DexLimitSteps).
 //
-// REQUIRES: system-linux
-//
 // RUN: %dexter_regression_test -- %s | FileCheck %s
 // CHECK: default_conditional_hit_count.cpp
 
 int main() {
     for (int y = 0; y < 4; ++y)
         for (int x = 0; x < 4; ++x)
             (void)0; // DexLabel('finish_line')
 }
 
 // DexFinishTest('x', 2, on_line=ref('finish_line'), hit_count=2)
 // DexExpectWatchValue('x', 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 0, 1, 2, on_line=ref('finish_line'))
 // DexExpectWatchValue('y', 0, 1, 2, on_line=ref('finish_line'))

cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/default_hit_count.cpp

 // Purpose:
 //      Test that \DexFinishTest can be used with a hit_count, so the test exits
 //      after the line referenced by \DexFinishTest has been stepped on a
 //      specific number of times.
 //      Tests using the default controller (no \DexLimitSteps).
 //
-// REQUIRES: system-linux
-//
 // RUN: %dexter_regression_test -- %s | FileCheck %s
 // CHECK: default_hit_count.cpp
 
 int main() {
     for (int x = 0; x < 10; ++x)
         (void)0; // DexLabel('finish_line')
 }
 
 // DexFinishTest(on_line=ref('finish_line'), hit_count=5)
-// DexExpectWatchValue('x', 0, 1, 2, 3, 4, 5)
+// DexExpectWatchValue('x', 0, 1, 2, 3, 4, 5, on_line=ref('finish_line'))

cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/default_simple.cpp

 // Purpose:
 //      Test that \DexFinishTest can be used without a condition or hit_count,
 //      so the test simply exits as soon as the line referenced by \DexFinishTest
 //      is stepped on.
 //      Tests using the default controller (no \DexLimitSteps).
 //
-// REQUIRES: system-linux
-//
 // RUN: %dexter_regression_test -- %s | FileCheck %s
 // CHECK: default_simple.cpp
 
 int main() {
-    int x = 0; // DexLabel('start_line')
-    x = 1;
+    int x = 0;
+    x = 1; // DexLabel('start_line')
     x = 2; // DexLabel('finish_line')
 }
 
 // DexFinishTest(on_line=ref('finish_line'))
-// DexExpectWatchValue('x', 0, 1)
+// DexExpectWatchValue('x', 0, 1, from_line=ref('start_line'), to_line=ref('finish_line'))

cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/limit_steps_conditional.cpp

 // Purpose:
 //      Test that \DexFinishTest can be used with a condition, so the test exits
 //      when the line referenced by \DexFinishTest is stepped on and the given
 //      condition (x == 5) is satisfied.
 //      Test using the conditional controller (using \DexLimitSteps).
 //
-// REQUIRES: system-linux
+// The dbgeng driver doesn't support \DexLimitSteps yet.
+// UNSUPPORTED: system-windows
 //
 // RUN: %dexter_regression_test -- %s | FileCheck %s
 // CHECK: limit_steps_conditional.cpp
 
 int main() {
     for (int x = 0; x < 10; ++x)
         (void)0; // DexLabel('finish_line')
 }
 
 // DexLimitSteps(on_line=ref('finish_line'))
 // DexFinishTest('x', 5, on_line=ref('finish_line'))
 // DexExpectWatchValue('x', 0, 1, 2, 3, 4, 5)

cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/limit_steps_conditional_hit_count.cpp

 // Purpose:
 //      Test that \DexFinishTest can be used with a combination of a hit_count
 //      and a condition, so that the test exits after the line referenced
 //      by \DexFinishTest is stepped on while the condition (x == 2) is true a
 //      given number of times.
 //      Test using the conditional controller (using \DexLimitSteps).
 //
-// REQUIRES: system-linux
+// The dbgeng driver doesn't support \DexLimitSteps yet.
+// UNSUPPORTED: system-windows
 //
 // RUN: %dexter_regression_test -- %s | FileCheck %s
 // CHECK: limit_steps_conditional_hit_count.cpp
 
 int main() {
     for (int y = 0; y < 4; ++y)
         for (int x = 0; x < 4; ++x)
             (void)0; // DexLabel('finish_line')
 }
 
 // DexLimitSteps(on_line=ref('finish_line'))
 // DexFinishTest('x', 2, on_line=ref('finish_line'), hit_count=2)
 // DexExpectWatchValue('x', 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, on_line=ref('finish_line'))
 // DexExpectWatchValue('y', 0, 1, 2, on_line=ref('finish_line'))

cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/limit_steps_hit_count.cpp

 // Purpose:
 //      Test that \DexFinishTest can be used with a hit_count, so the test exits
 //      after the line referenced by \DexFinishTest has been stepped on a
 //      specific number of times.
 //      Test using the conditional controller (using \DexLimitSteps).
 //
-// REQUIRES: system-linux
+// The dbgeng driver doesn't support \DexLimitSteps yet.
+// UNSUPPORTED: system-windows
 //
 // RUN: %dexter_regression_test -- %s | FileCheck %s
 // CHECK: limit_steps_hit_count.cpp
 
 int main() {
     for (int x = 0; x < 10; ++x)
         (void)0; // DexLabel('finish_line')
 }
 
 // DexLimitSteps(on_line=ref('finish_line'))
 // DexFinishTest(on_line=ref('finish_line'), hit_count=5)
 // DexExpectWatchValue('x', 0, 1, 2, 3, 4, 5)

cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/limit_steps_simple.cpp

 // Purpose:
 //      Test that \DexFinishTest can be used without a condition or hit_count,
 //      so the test simply exits as soon as the line referenced by \DexFinishTest
 //      is stepped on.
 //      Test using the conditional controller (using \DexLimitSteps).
 //
-// REQUIRES: system-linux
+// The dbgeng driver doesn't support \DexLimitSteps yet.
+// UNSUPPORTED: system-windows
 //
 // RUN: %dexter_regression_test -- %s | FileCheck %s
 // CHECK: limit_steps_simple.cpp
 
 int main() {
     int x = 0; // DexLabel('start')
     x = 1;
     x = 2; // DexLabel('finish_line')
 } // DexLabel('finish')
 
 // DexLimitSteps(from_line=ref('start'), to_line=ref('finish'))
 // DexFinishTest(on_line=ref('finish_line'))
 // DexExpectWatchValue('x', 0, 1)

cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/hit_count.cpp

 // Purpose:
 //      Test that \DexLimitSteps keyword argument hit_count correctly limits
 //      the number of times the command can trigger.
 //
-// REQUIRES: system-linux
-//
 // RUN: %dexter_regression_test -- %s | FileCheck %s
 // CHECK: hit_count.cpp
 
 int a;
 int main() {
   for (int i = 0; i < 4; i++) {
     a = i; // DexLabel('check')
   }
   return 0;
 }
 
 //// Unconditionally limit dexter's view of the program to 'on_line' and check
 //// for i=0, i=1. The test will fail if dexter sees any other value for test.
 // DexLimitSteps(hit_count=2, on_line=ref('check'))
 // DexExpectWatchValue('i', '0', '1')

cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/limit_steps_check_json_step_count.cpp

 // Purpose:
 //      Check number of step lines are correctly reported in json output.
 //
-// REQUIRES: system-linux
-//
 // RUN: %dexter_regression_test --verbose -- %s | FileCheck %s
 // CHECK: limit_steps_check_json_step_count.cpp
 // CHECK: ## BEGIN ##
 // CHECK-COUNT-3: json_step_count.cpp",
 
 int main() {
   int result = 0;
   for(int ix = 0; ix != 10; ++ix) {
     int index = ix;
     result += index; // DexLabel('check')
   }
 }
 
 // DexExpectWatchValue('index', 2, 7, 9, on_line=ref('check'))
 // DexLimitSteps('ix', 2, 7, 9, on_line=ref('check'))

cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/limit_steps_expect_loop.cpp

 // Purpose:
 //      Check the DexLimit steps only gathers step info for 2 iterations of a
 //      for loop.
 //
-// REQUIRES: system-linux
-//
 // RUN: %dexter_regression_test -- %s | FileCheck %s
 // CHECK: limit_steps_expect_loop.cpp:
 
 int main(const int argc, const char * argv[]) {
   unsigned int sum = 1;
   for(unsigned int ix = 0; ix != 5; ++ix) {
     unsigned thing_to_add = ix + ix - ix;   // DexLabel('start')
     sum += ix;                              // DexLabel('end')
   }
   return sum;
 }
 
 // DexLimitSteps('ix', 0, 3, from_line=ref('start'), to_line=ref('end'))
 // DexExpectWatchValue('ix', 0, 3, from_line=ref('start'), to_line=ref('end'))

cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/limit_steps_expect_value.cpp

 // Purpose:
 //      Ensure that limited stepping breaks for all expected values.
 //
-// REQUIRES: system-linux
-//
 // RUN: %dexter_regression_test -- %s | FileCheck %s
 // CHECK: limit_steps_expect_value.cpp
 
 int main() {
   int i = 0;
   i = 1;    // DexLabel('from')
   i = 2;
   i = 3;
   return 0; // DexLabel('long_range')
 }
 
 // DexLimitSteps('i', '0', from_line=ref('from'), to_line=ref('long_range'))
 // DexExpectWatchValue('i', 0, 1, 2, 3, from_line=ref('from'), to_line=ref('long_range'))

cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/limit_steps_line_mismatch.cpp

 // Purpose:
 //      Check that \DexLimitSteps works even if the opening breakpoint line
 //      doesn't exist. This can happen due to optimisations or label is on an
 //      empty line.
 //
-// FIXME: Windows regression tests run with dbgeng. \DexLimitSteps isn't yet
-// supported with dbgeng.
-//
-// REQUIRES: system-linux
-//
 // RUN: %dexter_regression_test -- %s | FileCheck %s
 // CHECK: limit_steps_line_mismatch.cpp
 
 int main() {
   int i = 0;
   for (; i < 2; i++) {
     // DexLabel('from')
     int x = i;
   }
   int ret = 0;
   return ret; // DexLabel('to')
 }
 
 // DexLimitSteps('1', '1', from_line=ref('from'), to_line=ref('to'))
 // DexExpectWatchValue('i', 0, 1, 2, from_line=ref('from'), to_line=ref('to'))

cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/limit_steps_overlapping_ranges.cpp

 // Purpose:
 //      Ensure that multiple overlapping \DexLimitSteps ranges do not interfere.
 //
-// REQUIRES: system-linux
-//
 // RUN: %dexter_regression_test -- %s | FileCheck %s
 // CHECK: limit_steps_overlapping_ranges.cpp
 
 int main() {
   int val1;
   int val2;
   int placeholder;
   for (int ix = 0; ix != 10; ++ix) {

cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/limit_steps_same_line_conditional.cpp

 // Purpose:
 //      Test that LimitStep commands can exist on the same from line.
 //
-// REQUIRES: system-linux
-//
 // RUN: %dexter_regression_test -- %s | FileCheck %s
 // CHECK: limit_steps_same_line_conditional.cpp
 
 int main() {
   int val1 = 0;
 
   int placeholder;
   for(int ix = 0; ix != 4; ++ix) {

cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/lit.local.cfg

+# The dbgeng driver doesn't support DexLimitSteps yet.
+if config.is_msvc:
+    config.unsupported = True
+

cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/unconditional.cpp

 // Purpose:
 //      Test that \DexLimitSteps can be used without a condition (i.e. the
 //      breakpoint range is set any time from_line is stepped on).
 //
-// REQUIRES: system-linux
-//
 // RUN: %dexter_regression_test -- %s | FileCheck %s
 // CHECK: unconditional.cpp
 
 int glob;
 int main() {
   int test = 0;
   for (test = 1; test < 4; test++) {
     glob += test; // DexLabel('from')

cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/lit.local.cfg

-if not 'lldb' in config.available_features:
-    config.unsupported = True

cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/clang-opt-bisect/clang-opt-bisect.cpp

 // Purpose:
 //     Check the `clang-opt-bisect` tool runs with typical input.
 //
-// REQUIRES: system-linux, lldb
-//
 // RUN: true
-// RUN: %dexter_base clang-opt-bisect --debugger 'lldb' --builder 'clang' \
-// RUN:     --cflags "-O0 -g" -- %s \
-// RUN:     | FileCheck %s
+// RUN: %dexter_base clang-opt-bisect \
+// RUN:     --debugger %dexter_regression_test_debugger \
+// RUN:     --builder %dexter_regression_test_builder \
+// RUN:     --cflags "%dexter_regression_test_cflags" \
+// RUN:     --ldflags "%dexter_regression_test_ldflags" \
+// RUN:     -- %s \
+// RUN: | FileCheck %s
 // CHECK: running pass 0
 // CHECK: wrote{{.*}}per_pass_score
 // CHECK: wrote{{.*}}pass-summary
 // CHECK: wrote{{.*}}overall-pass-summary
 
 int main() {
     return 0;
 }

cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/address_printing.cpp

 // Purpose:
 //      Test that address values in a \DexExpectWatchValue are printed with
 //      their address name along with the address' resolved value (if any), and
 //      that when verbose output is enabled the complete map of resolved
 //      addresses and list of unresolved addresses will also be printed.
 //
 //      Note: Currently "misordered result" is the only penalty that does not
 //      display the address properly; if it is implemented, this test should be
 //      updated.
 //
-// REQUIRES: lldb, system-linux
+// The dbgeng driver doesn't support \DexLimitSteps yet.
+// UNSUPPORTED: system-windows
 //
 // RUN: not %dexter_regression_test -v -- %s | FileCheck %s
 
 // CHECK: Resolved Addresses:
 // CHECK-NEXT: 'x_2': 0x[[X2_VAL:[0-9a-f]+]]
 // CHECK-NEXT: 'y': 0x[[Y_VAL:[0-9a-f]+]]
 // CHECK: Unresolved Addresses:
 // CHECK-NEXT: ['x_1']

cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_limit_steps_no_values.cpp

 // Purpose:
 //    Check that specifying an expression without any values to compare against
 //    in a \DexLimitSteps command results in a useful error message.
 //    Use --binary switch to trick dexter into skipping the build step.
 //
-// REQUIRES: system-linux
 // RUN: not %dexter_base test --binary %s --debugger 'lldb' -- %s | FileCheck %s
-// CHECK: parser error:{{.*}}err_limit_steps_no_values.cpp(10): expected 0 or at least 2 positional arguments
+// CHECK: parser error:{{.*}}err_limit_steps_no_values.cpp(9): expected 0 or at least 2 positional arguments
 
 // DexLimitSteps('test')

cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/label_another_line.cpp

-// REQUIRES: lldb
-// UNSUPPORTED: system-windows
-//
 // Purpose:
 //    Check that the optional keyword argument 'on_line' makes a \DexLabel label
 //    that line instead of the line the command is found on.
 //
 // RUN: %dexter_regression_test -- %s | FileCheck %s
 // CHECK: label_another_line.cpp: (1.0000)
 
 int main() {
   int result = 0;
   return result;
 }
 
-// DexLabel('test', on_line=13)
+// DexLabel('test', on_line=10)
 // DexExpectWatchValue('result', '0', on_line=ref('test'))

cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/label_offset.cpp

-// REQUIRES: lldb
 // Purpose:
 //      Check that we can use label-relative line numbers.
 //
 // RUN: %dexter_regression_test -v -- %s | FileCheck %s
 //
 // CHECK: label_offset.cpp: (1.0000)
 
 int main() {  // DexLabel('main')

cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/source-root-dir.cpp

-// XFAIL:*
 // This test started failing recently for unknown reasons.
-
-// REQUIRES: lldb
-// UNSUPPORTED: system-windows
-//
+// XFAIL:*
 // RUN: %dexter --fail-lt 1.0 -w \
-// RUN:     --builder 'clang' --debugger 'lldb' \
-// RUN:     --cflags "-O0 -glldb -fdebug-prefix-map=%S=/changed" \
+// RUN:     --builder %dexter_regression_test_builder \
+// RUN:     --debugger %dexter_regression_test_debugger \
+// RUN:     --cflags "%dexter_regression_test_cflags -fdebug-prefix-map=%S=/changed" \
+// RUN:     --ldflags "%dexter_regression_test_ldflags" \
 // RUN:     --source-root-dir=%S --debugger-use-relative-paths -- %s
 
 #include <stdio.h>
 int main() {
   int x = 42;
   printf("hello world: %d\n", x); // DexLabel('check')
 }
 
 // DexExpectWatchValue('x', 42, on_line=ref('check'))

cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/view.cpp

-// REQUIRES: lldb
 // Purpose:
 //      Check the `view` subtool works with typical inputs.
 //
 // RUN: %dexter_regression_test --results %t -- %s
 //
 // RUN: %dexter_base view %t/view.cpp.dextIR | FileCheck %s
 // CHECK: ## BEGIN
 // CHECK: ## END

cross-project-tests/lit.cfg.py

def configure_dexter_substitutions():
   tools.append(ToolSubst('%dexter_base', dexter_base_cmd))
 
   # Set up commands for DexTer regression tests.
   # Builder, debugger, optimisation level and several other flags differ
   # depending on whether we're running a unix like or windows os.
   if platform.system() == 'Windows':
     # The Windows builder script uses lld.
     dependencies = ['clang', 'lld-link']
-    dexter_regression_test_builder = '--builder clang-cl_vs2015'
-    dexter_regression_test_debugger = '--debugger dbgeng'
-    dexter_regression_test_cflags = '--cflags "/Zi /Od"'
-    dexter_regression_test_ldflags = '--ldflags "/Zi"'
+    dexter_regression_test_builder = 'clang-cl_vs2015'
+    dexter_regression_test_debugger = 'dbgeng'
+    dexter_regression_test_cflags = '/Zi /Od'
+    dexter_regression_test_ldflags = '/Zi'
   else:
     # Use lldb as the debugger on non-Windows platforms.
     dependencies = ['clang', 'lldb']
-    dexter_regression_test_builder = '--builder clang'
-    dexter_regression_test_debugger = "--debugger lldb"
-    dexter_regression_test_cflags = '--cflags "-O0 -glldb"'
+    dexter_regression_test_builder = 'clang'
+    dexter_regression_test_debugger = 'lldb'
+    dexter_regression_test_cflags = '-O0 -glldb'
     dexter_regression_test_ldflags = ''
 
+  tools.append(ToolSubst('%dexter_regression_test_builder', dexter_regression_test_builder))
+  tools.append(ToolSubst('%dexter_regression_test_debugger', dexter_regression_test_debugger))
+  tools.append(ToolSubst('%dexter_regression_test_cflags', dexter_regression_test_cflags))
+  tools.append(ToolSubst('%dexter_regression_test_ldflags', dexter_regression_test_cflags))
+
   # 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'
   # 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])
+    '--debugger', 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_cflags,
-    dexter_regression_test_ldflags])
+    '--builder', dexter_regression_test_builder,
+    '--cflags "',  dexter_regression_test_cflags + '"',
+    '--ldflags "', dexter_regression_test_ldflags + '"'])
   tools.append(ToolSubst('%dexter_regression_test', dexter_regression_test_build))
   return dependencies
 
 def add_host_triple(clang):
   return '{} --target={}'.format(clang, config.host_triple)
 
 # The set of arches we can build.
 targets = set(config.targets_to_build)