diff options
| author | GHC GitLab CI <ghc-ci@gitlab-haskell.org> | 2020-10-05 23:43:41 +0000 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2020-10-24 21:00:19 -0400 |
| commit | 58a5b0e55dfb7bbb95f51ade650b1d45dc2d929c (patch) | |
| tree | 5ccce188f3d6c964839ae211cd861816823d4161 /testsuite | |
| parent | 1a2e9f5e8f125ea47b1d6d2a1740614109488c24 (diff) | |
| download | haskell-58a5b0e55dfb7bbb95f51ade650b1d45dc2d929c.tar.gz | |
testsuite: Mark setnumcapabilities001 as broken with TSAN
Due to #18808.
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/driver/testglobals.py | 3 | ||||
| -rw-r--r-- | testsuite/driver/testlib.py | 3 | ||||
| -rw-r--r-- | testsuite/tests/concurrent/should_run/all.T | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/testsuite/driver/testglobals.py b/testsuite/driver/testglobals.py index 30b457e829..aa3bc4c4ff 100644 --- a/testsuite/driver/testglobals.py +++ b/testsuite/driver/testglobals.py @@ -151,6 +151,9 @@ class TestConfig: # Is the compiler dynamically linked? self.ghc_dynamic = False + # Are we running in a ThreadSanitizer-instrumented build? + self.have_thread_sanitizer = False + # Do symbols use leading underscores? self.leading_underscore = False diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py index 15bcdde0eb..d25748d405 100644 --- a/testsuite/driver/testlib.py +++ b/testsuite/driver/testlib.py @@ -578,6 +578,9 @@ def have_slow_bignum( ) -> bool: def llvm_build ( ) -> bool: return config.ghc_built_by_llvm +def have_thread_sanitizer( ) -> bool: + return config.have_thread_sanitizer + # --- # Note [Measuring residency] diff --git a/testsuite/tests/concurrent/should_run/all.T b/testsuite/tests/concurrent/should_run/all.T index 9297c5890e..2b8375e61e 100644 --- a/testsuite/tests/concurrent/should_run/all.T +++ b/testsuite/tests/concurrent/should_run/all.T @@ -245,6 +245,7 @@ test('conc068', [ omit_ways(concurrent_ways), exit_code(1) ], compile_and_run, [ test('setnumcapabilities001', [ only_ways(['threaded1','threaded2', 'nonmoving_thr']), extra_run_opts('8 12 2000'), + when(have_thread_sanitizer(), expect_broken(18808)), req_smp ], compile_and_run, ['']) |