[commit: packages/stm] master: Don't use only_compiler_types, assume ghc (a92741a)
git at git.haskell.org
git at git.haskell.org
Tue Feb 16 08:25:45 UTC 2016
Repository : ssh://git@git.haskell.org/stm
On branch : master
Link : http://git.haskell.org/packages/stm.git/commitdiff/a92741a64796eace06bc3c86467a0d036acf6eb9
>---------------------------------------------------------------
commit a92741a64796eace06bc3c86467a0d036acf6eb9
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date: Tue Feb 16 09:26:57 2016 +0100
Don't use only_compiler_types, assume ghc
>---------------------------------------------------------------
a92741a64796eace06bc3c86467a0d036acf6eb9
tests/all.T | 23 ++++++++++-------------
1 file changed, 10 insertions(+), 13 deletions(-)
diff --git a/tests/all.T b/tests/all.T
index 0efd7e8..92b641d 100644
--- a/tests/all.T
+++ b/tests/all.T
@@ -1,23 +1,20 @@
-setTestOpts(reqlib('stm'))
-
-test('stm046', only_compiler_types(['ghc']), compile_and_run, [''])
+test('stm046', [], compile_and_run, [''])
# Omit GHCi for these two, since they appear to deadlock (23/11/2004 --SDM)
test('stm047',
- [ only_compiler_types(['ghc']),
- omit_ways(['ghci']),
- when(compiler_lt('ghc', '6.9'), omit_ways(['ghci', 'threaded2'])) ],
+ [omit_ways(['ghci']),
+ when(compiler_lt('ghc', '6.9'), omit_ways(['ghci', 'threaded2']))],
compile_and_run, [''])
test('stm048',
- [ only_compiler_types(['ghc']),
- omit_ways(['ghci']),
- when(compiler_lt('ghc', '6.9'), omit_ways(['ghci', 'threaded2'])) ],
+ [omit_ways(['ghci']),
+ when(compiler_lt('ghc', '6.9'), omit_ways(['ghci', 'threaded2']))],
compile_and_run, [''])
-test('stm049', [ reqlib('random'), only_compiler_types(['ghc']) ],
- compile_and_run, ['-package stm'])
-test('stm050', [ only_compiler_types(['ghc']),
- extra_run_opts('10000') ], compile_and_run, ['-package stm'])
+# The above tests don't require 'stm', but the ones below do.
+setTestOpts(reqlib('stm'))
+
+test('stm049', [reqlib('random')], compile_and_run, ['-package stm'])
+test('stm050', [extra_run_opts('10000')], compile_and_run, ['-package stm'])
# Was failing prof ways due to #1547, but now apparently succeeds:
test('stm052', [ reqlib('random'),
More information about the ghc-commits
mailing list