diff options
| author | Sergei Trofimovich <siarheit@google.com> | 2015-10-30 21:04:49 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <siarheit@google.com> | 2015-10-30 23:07:09 +0000 |
| commit | e03e22c2c69d66c7f098de1951e7da2771a9109d (patch) | |
| tree | 4241e636b409c68d0184f04103d0c9c9f7337e5a /testsuite/tests | |
| parent | a5cb27f323a0c78f61db1a3c5338045b0981850b (diff) | |
| download | haskell-e03e22c2c69d66c7f098de1951e7da2771a9109d.tar.gz | |
testsuite: performGC requires SMP support for 'qg' option
Signed-off-by: Sergei Trofimovich <siarheit@google.com>
Diffstat (limited to 'testsuite/tests')
| -rw-r--r-- | testsuite/tests/concurrent/should_run/all.T | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/testsuite/tests/concurrent/should_run/all.T b/testsuite/tests/concurrent/should_run/all.T index 1ef566dcae..760ac186da 100644 --- a/testsuite/tests/concurrent/should_run/all.T +++ b/testsuite/tests/concurrent/should_run/all.T @@ -104,7 +104,7 @@ test('allocLimit4', [ extra_run_opts('+RTS -xq300k -RTS'), omit_ways(['ghci']) ], compile_and_run, ['']) -test('performGC', [ only_ways(['threaded1','threaded2']) +test('performGC', [ only_ways(['threaded1','threaded2']), req_smp , extra_run_opts('400 +RTS -qg -RTS') ], compile_and_run, ['']) @@ -244,18 +244,13 @@ test('conc067', ignore_output, compile_and_run, ['']) # than one CPU. test('conc068', [ omit_ways('threaded2'), exit_code(1) ], compile_and_run, ['']) -if (ghc_with_smp == 0): - skip_if_not_smp = skip -else: - skip_if_not_smp = normal - # Commented out, instead of marked expect_broken, because it fails only # sometimes. See #10860. #test('setnumcapabilities001', # [ only_ways(['threaded1','threaded2']), # extra_run_opts('4 12 2000'), # reqlib('parallel'), -# skip_if_not_smp ], +# req_smp ], # compile_and_run, ['']) # omit ghci, which can't handle unboxed tuples: |