[commit: ghc] master: testsuite: Ensure that unregisterised function is called (003ab6a)
git at git.haskell.org
git at git.haskell.org
Tue Dec 11 23:22:33 UTC 2018
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/003ab6a1288ed504447985a1329409adf4eaa367/ghc
>---------------------------------------------------------------
commit 003ab6a1288ed504447985a1329409adf4eaa367
Author: Ben Gamari <ben at smart-cactus.org>
Date: Tue Dec 11 17:34:10 2018 -0500
testsuite: Ensure that unregisterised function is called
Strangely the previous formulation works locally and under CircleCI but fails on
another machine. Odd.
>---------------------------------------------------------------
003ab6a1288ed504447985a1329409adf4eaa367
testsuite/tests/codeGen/should_compile/all.T | 4 ++--
testsuite/tests/codeGen/should_gen_asm/all.T | 2 +-
testsuite/tests/codeGen/should_run/all.T | 4 ++--
testsuite/tests/concurrent/T13615/all.T | 2 +-
testsuite/tests/concurrent/should_run/all.T | 2 +-
testsuite/tests/rts/all.T | 6 +++---
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/testsuite/tests/codeGen/should_compile/all.T b/testsuite/tests/codeGen/should_compile/all.T
index 465a4a3..7217d93 100644
--- a/testsuite/tests/codeGen/should_compile/all.T
+++ b/testsuite/tests/codeGen/should_compile/all.T
@@ -23,7 +23,7 @@ test('T7574', [cmm_src, omit_ways(llvm_ways)], compile, [''])
test('T8205', normal, compile, ['-O0'])
test('T9155', normal, compile, ['-O2'])
test('T9303', normal, compile, ['-O2'])
-test('T9329', [when(unregisterised, expect_broken(15467)), cmm_src], compile, [''])
+test('T9329', [when(unregisterised(), expect_broken(15467)), cmm_src], compile, [''])
test('debug',
[when((arch('powerpc64') or arch('powerpc64le')), expect_broken(11261))],
@@ -37,7 +37,7 @@ test('T12115', normal, compile, [''])
test('T12355', normal, compile, [''])
test('T14999',
[when((arch('powerpc64') or arch('powerpc64le')), expect_broken(11261)),
- when(unregisterised, skip),
+ when(unregisterised(), skip),
unless(opsys('linux') and arch('x86_64') and have_gdb() and
have_readelf(), skip)],
run_command, ['$MAKE -s --no-print-directory T14999'])
diff --git a/testsuite/tests/codeGen/should_gen_asm/all.T b/testsuite/tests/codeGen/should_gen_asm/all.T
index db5fdaf..08a0472 100644
--- a/testsuite/tests/codeGen/should_gen_asm/all.T
+++ b/testsuite/tests/codeGen/should_gen_asm/all.T
@@ -1,6 +1,6 @@
is_amd64_codegen = [
unless(platform('x86_64-unknown-linux'),skip),
- when(unregisterised, skip),
+ when(unregisterised(), skip),
]
test('memcpy', is_amd64_codegen, compile_cmp_asm, [''])
diff --git a/testsuite/tests/codeGen/should_run/all.T b/testsuite/tests/codeGen/should_run/all.T
index 0d5fcb9..7f976b8 100644
--- a/testsuite/tests/codeGen/should_run/all.T
+++ b/testsuite/tests/codeGen/should_run/all.T
@@ -73,7 +73,7 @@ test('cgrun066', normal, compile_and_run, [''])
test('cgrun067', [extra_files(['Cgrun067A.hs'])], compile_and_run, [''])
test('cgrun068', reqlib('random'), compile_and_run, [''])
test('cgrun069',
- [when(unregisterised, expect_broken(15467)),
+ [when(unregisterised(), expect_broken(15467)),
omit_ways(['ghci'])],
multi_compile_and_run,
['cgrun069', [('cgrun069_cmm.cmm', '')], ''])
@@ -164,7 +164,7 @@ test('T12855', normal, compile_and_run, [''])
test('T9577', [ unless(arch('x86_64') or arch('i386'),skip),
when(opsys('darwin'), expect_broken(12937)),
when(opsys('mingw32'), expect_broken(12965)),
- when(unregisterised, skip),
+ when(unregisterised(), skip),
only_ways(['normal']) ], compile_and_run, [''])
test('T13425', normal, compile_and_run, ['-O'])
diff --git a/testsuite/tests/concurrent/T13615/all.T b/testsuite/tests/concurrent/T13615/all.T
index 2ec8757..419fe9b 100644
--- a/testsuite/tests/concurrent/T13615/all.T
+++ b/testsuite/tests/concurrent/T13615/all.T
@@ -1,6 +1,6 @@
test('T13615',
[when(fast(), skip),
- when(unregisterised, skip),
+ when(unregisterised(), skip),
req_smp, # needs -N support
only_ways(threaded_ways),
extra_files(['Parallel.hs', 'Memo.hs']),
diff --git a/testsuite/tests/concurrent/should_run/all.T b/testsuite/tests/concurrent/should_run/all.T
index 19b69cc..99f9b6e 100644
--- a/testsuite/tests/concurrent/should_run/all.T
+++ b/testsuite/tests/concurrent/should_run/all.T
@@ -36,7 +36,7 @@ test('T3279', normal, compile_and_run, [''])
# This test takes a long time with the default context switch interval
test('T3429', [ extra_run_opts('+RTS -C0.001 -RTS'),
- unless(unregisterised, extra_ways(['debug_numa'])) ],
+ unless(unregisterised(), extra_ways(['debug_numa'])) ],
compile_and_run, [''])
# without -O, goes into an infinite loop
diff --git a/testsuite/tests/rts/all.T b/testsuite/tests/rts/all.T
index a02c0fb..ef4e42e 100644
--- a/testsuite/tests/rts/all.T
+++ b/testsuite/tests/rts/all.T
@@ -303,7 +303,7 @@ test('T9045', [ omit_ways(['ghci']), extra_run_opts('10000 +RTS -A8k -RTS') ], c
test('T9078', only_ways(['threaded1']), compile_and_run, [''])
test('T10017', [ when(opsys('mingw32'), skip)
- , when(unregisterised, skip)
+ , when(unregisterised(), skip)
, req_smp
, only_ways(threaded_ways), extra_run_opts('+RTS -N2 -RTS') ], compile_and_run, [''])
@@ -398,7 +398,7 @@ test('T10296a', [req_smp], run_command,
test('T10296b', [only_ways('threaded2')], compile_and_run, [''])
-test('numa001', [ extra_run_opts('8'), unless(unregisterised, extra_ways(['debug_numa'])) ]
+test('numa001', [ extra_run_opts('8'), unless(unregisterised(), extra_ways(['debug_numa'])) ]
, compile_and_run, [''])
test('T12497', [ unless(opsys('mingw32'), skip)
@@ -424,7 +424,7 @@ test('T14497', [omit_ways(['profasm']), multi_cpu_race], compile_and_run, ['-O']
test('T14695', [normal, ignore_stderr]
, run_command, ['$MAKE -s --no-print-directory T14695'])
test('T14702', [ ignore_stdout
- , when(unregisterised, skip)
+ , when(unregisterised(), skip)
, only_ways(['threaded1', 'threaded2'])
, extra_run_opts('+RTS -A32m -N8 -T -RTS')
]
More information about the ghc-commits
mailing list