[commit: ghc] wip/dmd-arity: testsuite: Use fragile modifier for more tests (a65bcbe)
git at git.haskell.org
git at git.haskell.org
Thu Mar 7 17:41:08 UTC 2019
Repository : ssh://git@git.haskell.org/ghc
On branch : wip/dmd-arity
Link : http://ghc.haskell.org/trac/ghc/changeset/a65bcbe7db4f39d18012ce28cb99bed2ce18e7f5/ghc
>---------------------------------------------------------------
commit a65bcbe7db4f39d18012ce28cb99bed2ce18e7f5
Author: Ben Gamari <ben at smart-cactus.org>
Date: Tue Feb 26 10:24:31 2019 -0500
testsuite: Use fragile modifier for more tests
>---------------------------------------------------------------
a65bcbe7db4f39d18012ce28cb99bed2ce18e7f5
testsuite/tests/concurrent/should_run/all.T | 6 ++----
testsuite/tests/ffi/should_run/all.T | 6 ++----
testsuite/tests/ghci/linking/all.T | 6 ++----
testsuite/tests/ghci/should_run/all.T | 2 +-
testsuite/tests/profiling/should_run/all.T | 7 ++-----
5 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/testsuite/tests/concurrent/should_run/all.T b/testsuite/tests/concurrent/should_run/all.T
index 5ba0657..4e60a1d 100644
--- a/testsuite/tests/concurrent/should_run/all.T
+++ b/testsuite/tests/concurrent/should_run/all.T
@@ -74,8 +74,7 @@ test('T5558',
compile_and_run, [''])
test('T5421', normal, compile_and_run, [''])
-# See #12751, the test fails non-deterministically so we skip it.
-test('T5611', when ( opsys('darwin'), skip) , compile_and_run, [''])
+test('T5611', when(opsys('darwin'), fragile(12751)) , compile_and_run, [''])
test('T5238', normal, compile_and_run, [''])
test('T5866', exit_code(1), compile_and_run, [''])
@@ -196,8 +195,7 @@ test('conc036', skip, compile_and_run, [''])
# Interrupting foreign calls only makes sense if we are threaded
test('foreignInterruptible', [when(fast(), skip),
when(opsys('mingw32'),expect_fail),
- # Fragile in unregisterised way; see #15467.
- when(unregisterised(), skip),
+ when(unregisterised(), fragile(15467)),
# I don't think we support interrupting Sleep()
# on Windows. --SDM
only_threaded_ways,
diff --git a/testsuite/tests/ffi/should_run/all.T b/testsuite/tests/ffi/should_run/all.T
index e9ea975..96ab506 100644
--- a/testsuite/tests/ffi/should_run/all.T
+++ b/testsuite/tests/ffi/should_run/all.T
@@ -87,8 +87,7 @@ test('ffi018', [omit_ways(['ghci'])], compile_and_run, ['ffi018_c.c'])
test('ffi018_ghci',
[extra_files(['ffi018.h']),
only_ways(['ghci']),
- # This test is fragile when unregisterised; see #16085
- when(unregisterised(), skip),
+ when(unregisterised(), fragile(16085)),
pre_cmd('$MAKE -s --no-print-directory ffi018_ghci_setup')],
compile_and_run, ['ffi018_ghci_c.o'])
@@ -100,8 +99,7 @@ test('T1679', normal, compile_and_run, [''])
test('T1288', [omit_ways(['ghci'])], compile_and_run, ['T1288_c.c'])
test('T1288_ghci',
[only_ways(['ghci']),
- # This test is fragile when unregisterised; see #16085
- when(unregisterised(), skip),
+ when(unregisterised(), fragile(16085)),
pre_cmd('$MAKE -s --no-print-directory T1288_ghci_setup')],
compile_and_run, ['T1288_ghci_c.o'])
diff --git a/testsuite/tests/ghci/linking/all.T b/testsuite/tests/ghci/linking/all.T
index 792e91b..88ada22 100644
--- a/testsuite/tests/ghci/linking/all.T
+++ b/testsuite/tests/ghci/linking/all.T
@@ -6,8 +6,7 @@ test('ghcilink001',
makefile_test, ['ghcilink001'])
test('ghcilink002', [extra_files(['TestLink.hs', 'f.c']),
- # Fragile when unregisterised; see #16085
- when(unregisterised(), skip),
+ when(unregisterised(), fragile(16085)),
unless(doing_ghci, skip)],
makefile_test, ['ghcilink002'])
@@ -21,8 +20,7 @@ test('ghcilink004',
test('ghcilink005',
[extra_files(['TestLink.hs', 'f.c']),
- # Fragile when unregisterised; see #16085
- when(unregisterised(), skip),
+ when(unregisterised(), fragile(16085)),
unless(doing_ghci, skip)],
makefile_test, ['ghcilink005'])
diff --git a/testsuite/tests/ghci/should_run/all.T b/testsuite/tests/ghci/should_run/all.T
index 5440019..84693d7 100644
--- a/testsuite/tests/ghci/should_run/all.T
+++ b/testsuite/tests/ghci/should_run/all.T
@@ -11,7 +11,7 @@ test('T2881', just_ghci, compile_and_run, [''])
test('T3171',
[when(opsys('mingw32'),skip),
- skip, # This test is quite flaky (#15383)
+ fragile(15383),
req_interp,
combined_output],
makefile_test, [])
diff --git a/testsuite/tests/profiling/should_run/all.T b/testsuite/tests/profiling/should_run/all.T
index 044d4fe..f6891c3 100644
--- a/testsuite/tests/profiling/should_run/all.T
+++ b/testsuite/tests/profiling/should_run/all.T
@@ -87,9 +87,7 @@ test('prof-doc-fib', [], compile_and_run, [''])
test('prof-doc-last', [], compile_and_run, ['-fno-full-laziness'])
# unicode in cost centre names
-test('T5559',
- [ skip # Skip due to non-deterministic failures on CI, see Trac #16350
- ], compile_and_run, [''])
+test('T5559', fragile(16350), compile_and_run, [''])
# Note [consistent stacks]
# Certain optimisations can change the stacks we get out of the
@@ -150,6 +148,5 @@ test('T14257', [], makefile_test, ['T14257'])
test('T15897',
[extra_ways(['profasm']), only_ways(['profasm']),
run_timeout_multiplier(2),
- # Takes too long and is quite fragile (#15467, #16193)
- skip],
+ fragile(15467)],
makefile_test, ['T15897'])
More information about the ghc-commits
mailing list