From ae37e2285d233f28217e4e95a3ff71059c7ee8c7 Mon Sep 17 00:00:00 2001 From: Jonas Devlieghere Date: Mon, 23 Mar 2020 09:52:42 -0700 Subject: [PATCH] [lldb/Reproducers] Mark reproducer test directory as unsupported on Windows Reproducers are unsupported on Windows. Rather than having a UNSUPPORTED line in every test, just skip the whole subdirectory. --- lldb/test/Shell/Reproducer/Functionalities/TestDataFormatter.test | 2 +- .../Shell/Reproducer/Functionalities/TestExpressionEvaluation.test | 2 +- lldb/test/Shell/Reproducer/Functionalities/TestImageList.test | 2 +- lldb/test/Shell/Reproducer/Functionalities/TestStepping.test | 2 +- lldb/test/Shell/Reproducer/TestCaptureEnvOverride.test | 1 - lldb/test/Shell/Reproducer/TestCrash.test | 1 - lldb/test/Shell/Reproducer/TestDiscard.test | 1 - lldb/test/Shell/Reproducer/TestDump.test | 1 - lldb/test/Shell/Reproducer/TestGDBRemoteRepro.test | 2 +- lldb/test/Shell/Reproducer/TestMultipleTargets.test | 2 +- lldb/test/Shell/Reproducer/TestRelativePath.test | 1 - lldb/test/Shell/Reproducer/TestReuseDirectory.test | 2 +- lldb/test/Shell/Reproducer/TestSynchronous.test | 1 - lldb/test/Shell/Reproducer/TestWorkingDir.test | 2 -- lldb/test/Shell/Reproducer/lit.local.cfg | 3 +++ 15 files changed, 10 insertions(+), 15 deletions(-) diff --git a/lldb/test/Shell/Reproducer/Functionalities/TestDataFormatter.test b/lldb/test/Shell/Reproducer/Functionalities/TestDataFormatter.test index 7db8bc4..d133c8d 100644 --- a/lldb/test/Shell/Reproducer/Functionalities/TestDataFormatter.test +++ b/lldb/test/Shell/Reproducer/Functionalities/TestDataFormatter.test @@ -1,4 +1,4 @@ -# UNSUPPORTED: system-windows, system-freebsd +# UNSUPPORTED: system-freebsd # This tests that data formatters continue to work when replaying a reproducer. diff --git a/lldb/test/Shell/Reproducer/Functionalities/TestExpressionEvaluation.test b/lldb/test/Shell/Reproducer/Functionalities/TestExpressionEvaluation.test index e2bcb2d..f400cef 100644 --- a/lldb/test/Shell/Reproducer/Functionalities/TestExpressionEvaluation.test +++ b/lldb/test/Shell/Reproducer/Functionalities/TestExpressionEvaluation.test @@ -1,4 +1,4 @@ -# UNSUPPORTED: system-windows, system-freebsd +# UNSUPPORTED: system-freebsd # XFAIL: system-netbsd # Flaky diff --git a/lldb/test/Shell/Reproducer/Functionalities/TestImageList.test b/lldb/test/Shell/Reproducer/Functionalities/TestImageList.test index db31909..ec8b36e 100644 --- a/lldb/test/Shell/Reproducer/Functionalities/TestImageList.test +++ b/lldb/test/Shell/Reproducer/Functionalities/TestImageList.test @@ -1,4 +1,4 @@ -# UNSUPPORTED: system-windows, system-freebsd +# UNSUPPORTED: system-freebsd # This tests that image list works when replaying. We arbitrarily assume # there's at least two entries and compare that they're identical. diff --git a/lldb/test/Shell/Reproducer/Functionalities/TestStepping.test b/lldb/test/Shell/Reproducer/Functionalities/TestStepping.test index 1dec9a0..ba9164f 100644 --- a/lldb/test/Shell/Reproducer/Functionalities/TestStepping.test +++ b/lldb/test/Shell/Reproducer/Functionalities/TestStepping.test @@ -1,4 +1,4 @@ -# UNSUPPORTED: system-windows, system-freebsd +# UNSUPPORTED: system-freebsd # This tests that stepping continues to work when replaying a reproducer. diff --git a/lldb/test/Shell/Reproducer/TestCaptureEnvOverride.test b/lldb/test/Shell/Reproducer/TestCaptureEnvOverride.test index a8e7bde..ef06bce 100644 --- a/lldb/test/Shell/Reproducer/TestCaptureEnvOverride.test +++ b/lldb/test/Shell/Reproducer/TestCaptureEnvOverride.test @@ -1,4 +1,3 @@ -# UNSUPPORTED: system-windows # This tests the LLDB_CAPTURE_REPRODUCER override. # RUN: %lldb -b -o 'reproducer status' --capture --capture-path %t.repro /bin/ls | FileCheck %s --check-prefix CAPTURE diff --git a/lldb/test/Shell/Reproducer/TestCrash.test b/lldb/test/Shell/Reproducer/TestCrash.test index cb0c09a..1389a9b 100644 --- a/lldb/test/Shell/Reproducer/TestCrash.test +++ b/lldb/test/Shell/Reproducer/TestCrash.test @@ -1,4 +1,3 @@ -# UNSUPPORTED: system-windows # This tests that a reproducer is generated when LLDB crashes. # Start clean. diff --git a/lldb/test/Shell/Reproducer/TestDiscard.test b/lldb/test/Shell/Reproducer/TestDiscard.test index db9614a..829aabb 100644 --- a/lldb/test/Shell/Reproducer/TestDiscard.test +++ b/lldb/test/Shell/Reproducer/TestDiscard.test @@ -1,4 +1,3 @@ -# UNSUPPORTED: system-windows # This ensures that the reproducer properly cleans up after itself. # Build the inferior. diff --git a/lldb/test/Shell/Reproducer/TestDump.test b/lldb/test/Shell/Reproducer/TestDump.test index c193b80..8300a97 100644 --- a/lldb/test/Shell/Reproducer/TestDump.test +++ b/lldb/test/Shell/Reproducer/TestDump.test @@ -1,4 +1,3 @@ -# UNSUPPORTED: system-windows # This tests the reproducer dump functionality. # Generate a reproducer. diff --git a/lldb/test/Shell/Reproducer/TestGDBRemoteRepro.test b/lldb/test/Shell/Reproducer/TestGDBRemoteRepro.test index 609c839..683a7e2 100644 --- a/lldb/test/Shell/Reproducer/TestGDBRemoteRepro.test +++ b/lldb/test/Shell/Reproducer/TestGDBRemoteRepro.test @@ -1,4 +1,4 @@ -# UNSUPPORTED: system-windows, system-freebsd +# UNSUPPORTED: system-freebsd # This tests the replaying of GDB remote packets. # diff --git a/lldb/test/Shell/Reproducer/TestMultipleTargets.test b/lldb/test/Shell/Reproducer/TestMultipleTargets.test index ce1a5ec..7859480 100644 --- a/lldb/test/Shell/Reproducer/TestMultipleTargets.test +++ b/lldb/test/Shell/Reproducer/TestMultipleTargets.test @@ -1,4 +1,4 @@ -# UNSUPPORTED: system-windows, system-freebsd +# UNSUPPORTED: system-freebsd # This tests the replaying with multiple targets. diff --git a/lldb/test/Shell/Reproducer/TestRelativePath.test b/lldb/test/Shell/Reproducer/TestRelativePath.test index 2ee4bf0..fa75187 100644 --- a/lldb/test/Shell/Reproducer/TestRelativePath.test +++ b/lldb/test/Shell/Reproducer/TestRelativePath.test @@ -1,4 +1,3 @@ -# UNSUPPORTED: system-windows # This tests relative capture paths. # RUN: mkdir -p %t diff --git a/lldb/test/Shell/Reproducer/TestReuseDirectory.test b/lldb/test/Shell/Reproducer/TestReuseDirectory.test index 31b71a0..a3fecce 100644 --- a/lldb/test/Shell/Reproducer/TestReuseDirectory.test +++ b/lldb/test/Shell/Reproducer/TestReuseDirectory.test @@ -1,4 +1,4 @@ -# UNSUPPORTED: system-windows, system-freebsd +# UNSUPPORTED: system-freebsd # Test that we can capture twice to the same directory without breaking the # reproducer functionality. diff --git a/lldb/test/Shell/Reproducer/TestSynchronous.test b/lldb/test/Shell/Reproducer/TestSynchronous.test index c62cbe8..f32ce8c 100644 --- a/lldb/test/Shell/Reproducer/TestSynchronous.test +++ b/lldb/test/Shell/Reproducer/TestSynchronous.test @@ -1,5 +1,4 @@ # REQUIRES: python -# UNSUPPORTED: system-windows # Ensure that replay happens in synchronous mode. # RUN: rm -rf %t.repro diff --git a/lldb/test/Shell/Reproducer/TestWorkingDir.test b/lldb/test/Shell/Reproducer/TestWorkingDir.test index 707916b..1d4c769 100644 --- a/lldb/test/Shell/Reproducer/TestWorkingDir.test +++ b/lldb/test/Shell/Reproducer/TestWorkingDir.test @@ -1,5 +1,3 @@ -# XFAIL: system-windows - # This tests that the reproducer can deal with relative files. We create a # binary in a subdirectory and pass its relative path to LLDB. The subdirectory # is removed before replay so that it only exists in the reproducer's VFS. diff --git a/lldb/test/Shell/Reproducer/lit.local.cfg b/lldb/test/Shell/Reproducer/lit.local.cfg index 7f40227..30f97f2 100644 --- a/lldb/test/Shell/Reproducer/lit.local.cfg +++ b/lldb/test/Shell/Reproducer/lit.local.cfg @@ -6,5 +6,8 @@ if 'LLVM_DISABLE_CRASH_REPORT' in config.environment: if 'LLDB_CAPTURE_REPRODUCER' in config.environment: del config.environment['LLDB_CAPTURE_REPRODUCER'] +if 'system-windows' in config.available_features: + config.unsupported = True + if 'lldb-repro' in config.available_features: config.unsupported = True -- 2.7.4