testsuite: performGC requires SMP support for 'qg' option
authorSergei Trofimovich <siarheit@google.com>
Fri, 30 Oct 2015 21:04:49 +0000 (21:04 +0000)
committerSergei Trofimovich <siarheit@google.com>
Fri, 30 Oct 2015 23:07:09 +0000 (23:07 +0000)
Signed-off-by: Sergei Trofimovich <siarheit@google.com>
testsuite/tests/concurrent/should_run/all.T

index 1ef566d..760ac18 100644 (file)
@@ -104,7 +104,7 @@ test('allocLimit4', [ extra_run_opts('+RTS -xq300k -RTS'),
                       omit_ways(['ghci']) ],
                     compile_and_run, [''])
 
                       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, [''])
 
                   , 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, [''])
 
 # 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'),
 # 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:
 #     compile_and_run, [''])
 
 # omit ghci, which can't handle unboxed tuples: