diff options
Diffstat (limited to 'testsuite/tests/rts')
| -rw-r--r-- | testsuite/tests/rts/T10672/all.T | 4 | ||||
| -rw-r--r-- | testsuite/tests/rts/T11223/all.T | 45 | ||||
| -rw-r--r-- | testsuite/tests/rts/T12031/all.T | 2 | ||||
| -rw-r--r-- | testsuite/tests/rts/T12771/all.T | 2 | ||||
| -rw-r--r-- | testsuite/tests/rts/T13082/all.T | 4 | ||||
| -rw-r--r-- | testsuite/tests/rts/T14611/all.T | 2 | ||||
| -rw-r--r-- | testsuite/tests/rts/T15261/all.T | 4 | ||||
| -rw-r--r-- | testsuite/tests/rts/T15894/all.T | 2 | ||||
| -rw-r--r-- | testsuite/tests/rts/T8308/all.T | 3 | ||||
| -rw-r--r-- | testsuite/tests/rts/all.T | 61 |
10 files changed, 52 insertions, 77 deletions
diff --git a/testsuite/tests/rts/T10672/all.T b/testsuite/tests/rts/T10672/all.T index c24ded25b4..1e04f1ba3f 100644 --- a/testsuite/tests/rts/T10672/all.T +++ b/testsuite/tests/rts/T10672/all.T @@ -1,9 +1,9 @@ test('T10672_x64', [extra_files(['Main.hs', 'Printf.hs', 'cxxy.cpp']), [unless(opsys('mingw32'), skip), unless(arch('x86_64'), skip)]], - run_command, ['$MAKE -s --no-print-directory T10672_x64']) + makefile_test, ['T10672_x64']) test('T10672_x86', [extra_files(['Main.hs', 'Printf.hs', 'cxxy.cpp']), [unless(opsys('mingw32'), skip), unless(arch('i386'), skip)]], - run_command, ['$MAKE -s --no-print-directory T10672_x86']) + makefile_test, ['T10672_x86']) diff --git a/testsuite/tests/rts/T11223/all.T b/testsuite/tests/rts/T11223/all.T index 6656e7fa34..1fc09e3cfd 100644 --- a/testsuite/tests/rts/T11223/all.T +++ b/testsuite/tests/rts/T11223/all.T @@ -15,59 +15,50 @@ def normalise_duplicate_errmsg( msg ): test('T11223_simple_link', [extra_files(['foo.c', 'foo.hs']), when(ghc_dynamic(), skip)], - run_command, - ['$MAKE -s --no-print-directory t_11223_simple_link']) + makefile_test, ['t_11223_simple_link']) test('T11223_simple_link_lib', [extra_files(['foo.c', 'foo.hs']), when(ghc_dynamic(), skip)], - run_command, - ['$MAKE -s --no-print-directory t_11223_simple_link_lib']) + makefile_test, ['t_11223_simple_link_lib']) # I'm ignoring the output since for this particular invocation normalise_errmsg # isn't being called and I can't figure out why not. test('T11223_simple_duplicate', [extra_files(['bar.c', 'foo.c', 'foo.hs']), when(ghc_dynamic(), skip), ignore_stderr, ignore_stdout, exit_code(2), normalise_errmsg_fun(normalise_duplicate_errmsg)], - run_command, - ['$MAKE -s --no-print-directory t_11223_simple_duplicate']) + makefile_test, ['t_11223_simple_duplicate']) test('T11223_simple_duplicate_lib', [extra_files(['bar.c', 'foo.c', 'foo.hs']), when(platform('i386-unknown-mingw32'), expect_broken(13515)), when(ghc_dynamic(), skip), normalise_errmsg_fun(normalise_duplicate_errmsg)], - run_command, - ['$MAKE -s --no-print-directory t_11223_simple_duplicate_lib']) + makefile_test, ['t_11223_simple_duplicate_lib']) test('T11223_simple_unused_duplicate_lib', [extra_files(['bar.c', 'foo.c', 'foo.hs']), when(ghc_dynamic(), skip)], - run_command, - ['$MAKE -s --no-print-directory t_11223_simple_unused_duplicate_lib']) + makefile_test, ['t_11223_simple_unused_duplicate_lib']) test('T11223_link_order_a_b_succeed', [extra_files(['bar.c', 'foo.c', 'foo2.hs']), when(ghc_dynamic(), skip)], - run_command, - ['$MAKE -s --no-print-directory t_11223_link_order_a_b_succeed']) + makefile_test, ['t_11223_link_order_a_b_succeed']) test('T11223_link_order_b_a_succeed', [extra_files(['bar.c', 'foo.c', 'foo2.hs']), when(ghc_dynamic(), skip)], - run_command, - ['$MAKE -s --no-print-directory t_11223_link_order_b_a_succeed']) + makefile_test, ['t_11223_link_order_b_a_succeed']) test('T11223_link_order_a_b_2_fail', [extra_files(['bar.c', 'foo.c', 'foo3.hs']), when(ghc_dynamic(), skip), normalise_errmsg_fun(normalise_duplicate_errmsg)], - run_command, - ['$MAKE -s --no-print-directory t_11223_link_order_a_b_2_fail']) + makefile_test, ['t_11223_link_order_a_b_2_fail']) test('T11223_link_order_b_a_2_succeed', [extra_files(['bar.c', 'foo.c', 'foo3.hs']), when(ghc_dynamic(), skip)], - run_command, - ['$MAKE -s --no-print-directory t_11223_link_order_b_a_2_succeed']) + makefile_test, ['t_11223_link_order_b_a_2_succeed']) # Weak Symbols are not currently implemented. So Disable all the tests # See Note [weak-symbols-support] in Linker.c @@ -75,35 +66,29 @@ test('T11223_link_order_b_a_2_succeed', test('T11223_weak_only_link_fail', [extra_files(['power.c', 'power.hs']), when(ghc_dynamic(), skip), expect_broken(11817)], - run_command, - ['$MAKE -s --no-print-directory t_11223_weak_only_link_fail']) + makefile_test, ['t_11223_weak_only_link_fail']) test('T11223_weak_only_link_succeed', [extra_files(['power3.hs', 'power_slow.c']), when(ghc_dynamic(), skip), expect_broken(11817)], - run_command, - ['$MAKE -s --no-print-directory t_11223_weak_only_link_succeed']) + makefile_test, ['t_11223_weak_only_link_succeed']) test('T11223_weak_both_link_order_a_b_succeed', [extra_files(['power.c', 'power3.hs', 'power_slow.c']), when(ghc_dynamic(), skip), expect_broken(11817)], - run_command, - ['$MAKE -s --no-print-directory t_11223_weak_both_link_order_a_b_succeed']) + makefile_test, ['t_11223_weak_both_link_order_a_b_succeed']) test('T11223_weak_both_link_order_b_a_succeed', [extra_files(['power.c', 'power3.hs', 'power_slow.c']), when(ghc_dynamic(), skip), expect_broken(11817)], - run_command, - ['$MAKE -s --no-print-directory t_11223_weak_both_link_order_b_a_succeed']) + makefile_test, ['t_11223_weak_both_link_order_b_a_succeed']) test('T11223_weak_single_link_order_a_b_succeed', [extra_files(['power.c', 'power3.hs', 'power_slow.c']), when(ghc_dynamic(), skip), expect_broken(11817)], - run_command, - ['$MAKE -s --no-print-directory t_11223_weak_single_link_order_a_b_succeed']) + makefile_test, ['t_11223_weak_single_link_order_a_b_succeed']) test('T11223_weak_single_link_order_b_a_succeed', [extra_files(['power.c', 'power3.hs', 'power_slow.c']), when(ghc_dynamic(), skip), expect_broken(11817)], - run_command, - ['$MAKE -s --no-print-directory t_11223_weak_single_link_order_b_a_succeed']) + makefile_test, ['t_11223_weak_single_link_order_b_a_succeed']) diff --git a/testsuite/tests/rts/T12031/all.T b/testsuite/tests/rts/T12031/all.T index abff4472e4..bddcaa30c6 100644 --- a/testsuite/tests/rts/T12031/all.T +++ b/testsuite/tests/rts/T12031/all.T @@ -1,4 +1,4 @@ test('T12031', [extra_files(['bar.c', 'baz.c', 'ExternBug.hs', 'foo.h']), unless(opsys('mingw32'), skip)], - run_command, ['$MAKE -s --no-print-directory T12031']) + makefile_test, ['T12031']) diff --git a/testsuite/tests/rts/T12771/all.T b/testsuite/tests/rts/T12771/all.T index f38eda25e0..55ada90cb3 100644 --- a/testsuite/tests/rts/T12771/all.T +++ b/testsuite/tests/rts/T12771/all.T @@ -1,4 +1,4 @@ test('T12771', [extra_files(['foo.c', 'main.hs', 'foo_dll.c']), unless(opsys('mingw32'), skip)], - run_command, ['$MAKE -s --no-print-directory T12771']) + makefile_test, ['T12771']) diff --git a/testsuite/tests/rts/T13082/all.T b/testsuite/tests/rts/T13082/all.T index 9580bc40b8..8219127051 100644 --- a/testsuite/tests/rts/T13082/all.T +++ b/testsuite/tests/rts/T13082/all.T @@ -17,8 +17,8 @@ def normalise_search_dirs (str): test('T13082_good', [extra_files(['foo.c', 'main.hs', 'foo_dll.c']), unless(opsys('mingw32'), skip)], - run_command, ['$MAKE -s --no-print-directory T13082_good']) + makefile_test, ['T13082_good']) test('T13082_fail', [extra_files(['main.hs']), unless(opsys('mingw32'), skip), normalise_errmsg_fun(normalise_search_dirs)], - run_command, ['$MAKE -s --no-print-directory T13082_fail']) + makefile_test, ['T13082_fail']) diff --git a/testsuite/tests/rts/T14611/all.T b/testsuite/tests/rts/T14611/all.T index 1387e6752d..ef7873ce16 100644 --- a/testsuite/tests/rts/T14611/all.T +++ b/testsuite/tests/rts/T14611/all.T @@ -1,4 +1,4 @@ test('T14611', [extra_files(['foo.c', 'main.hs', 'foo_dll.c']), unless(opsys('mingw32'), skip)], - run_command, ['$MAKE -s --no-print-directory T14611']) + makefile_test, ['T14611']) diff --git a/testsuite/tests/rts/T15261/all.T b/testsuite/tests/rts/T15261/all.T index 5bc6977c26..402764ddb7 100644 --- a/testsuite/tests/rts/T15261/all.T +++ b/testsuite/tests/rts/T15261/all.T @@ -1,2 +1,2 @@ -test('T15261a', normal, run_command, ['$MAKE -s --no-print-directory T15261a']) -test('T15261b', normal, run_command, ['$MAKE -s --no-print-directory T15261b']) +test('T15261a', normal, makefile_test, ['T15261a']) +test('T15261b', normal, makefile_test, ['T15261b']) diff --git a/testsuite/tests/rts/T15894/all.T b/testsuite/tests/rts/T15894/all.T index 07733669a4..a2c207979e 100644 --- a/testsuite/tests/rts/T15894/all.T +++ b/testsuite/tests/rts/T15894/all.T @@ -1,3 +1,3 @@ test('T15894', [extra_files(['copysign.c', 'main.hs']), when(ghc_dynamic(), skip)], - run_command, ['$MAKE -s --no-print-directory T15894']) + makefile_test, ['T15894']) diff --git a/testsuite/tests/rts/T8308/all.T b/testsuite/tests/rts/T8308/all.T index 094140f1d2..cbc86a51cb 100644 --- a/testsuite/tests/rts/T8308/all.T +++ b/testsuite/tests/rts/T8308/all.T @@ -1,2 +1 @@ -test('T8308', normal, - run_command, ['$MAKE -s --no-print-directory T8308']) +test('T8308', normal, makefile_test, ['T8308']) diff --git a/testsuite/tests/rts/all.T b/testsuite/tests/rts/all.T index ca8177c526..43c07641b4 100644 --- a/testsuite/tests/rts/all.T +++ b/testsuite/tests/rts/all.T @@ -64,8 +64,8 @@ test('divbyzero', compile_and_run, ['-with-rtsopts="--generate-stack-traces=no"']) test('outofmem', when(opsys('darwin'), skip), - run_command, ['$MAKE -s --no-print-directory outofmem']) -test('outofmem2', normal, run_command, ['$MAKE -s --no-print-directory outofmem2']) + makefile_test, ['outofmem']) +test('outofmem2', normal, makefile_test, ['outofmem2']) test('T2047', [ignore_stdout, extra_run_opts('+RTS -c -RTS')], compile_and_run, ['-package containers']) @@ -145,15 +145,15 @@ test('traceBinaryEvent', [ omit_ways(['dyn', 'ghci'] + prof_ways), test('EventlogOutput1', [ extra_files(["EventlogOutput.hs"]), omit_ways(['dyn', 'ghci'] + prof_ways) ], - run_command, ['$MAKE -s --no-print-directory EventlogOutput1']) + makefile_test, ['EventlogOutput1']) # Test that -ol flag defaults to <program>.eventlog test('EventlogOutput2', [ extra_files(["EventlogOutput.hs"]), omit_ways(['dyn', 'ghci'] + prof_ways) ], - run_command, ['$MAKE -s --no-print-directory EventlogOutput2']) + makefile_test, ['EventlogOutput2']) -test('T4059', [], run_command, ['$MAKE -s --no-print-directory T4059']) +test('T4059', [], makefile_test, ['T4059']) # Test for #4274 test('exec_signals', @@ -164,7 +164,7 @@ test('exec_signals', test('return_mem_to_os', normal, compile_and_run, ['']) -test('T4850', when(opsys('mingw32'), expect_broken(4850)), run_command, ['$MAKE -s --no-print-directory T4850']) +test('T4850', when(opsys('mingw32'), expect_broken(4850)), makefile_test, ['T4850']) def config_T5250(name, opts): if not (config.arch in ['i386','x86_64']): @@ -180,7 +180,7 @@ test('T5250', [extra_files(['spalign.c']), omit_ways(['ghci']) ], compile_and_run, ['spalign.c']) -test('T5423', [], run_command, ['$MAKE -s --no-print-directory T5423']) +test('T5423', [], makefile_test, ['T5423']) # Workaround bug #8458: old dlopen opens sections in the wrong order, # so we just accept both orders. @@ -208,22 +208,22 @@ def checkDynAsm(actual_file, normaliser): test('T5435_v_asm_a', [extra_files(['T5435.hs', 'T5435_asm.c']), when(arch('powerpc64') or arch('powerpc64le'), expect_broken(11259))], - run_command, ['$MAKE -s --no-print-directory T5435_v_asm_a']) + makefile_test, ['T5435_v_asm_a']) # this one just needs to run on linux, as darwin/mingw32 are covered # by the _a test already. test('T5435_v_asm_b', [extra_files(['T5435.hs', 'T5435_asm.c']), when(arch('powerpc64') or arch('powerpc64le'), expect_broken(11259)), when(opsys('darwin') or opsys('mingw32'), skip)], - run_command, ['$MAKE -s --no-print-directory T5435_v_asm_b']) + makefile_test, ['T5435_v_asm_b']) test('T5435_v_gcc', [extra_files(['T5435.hs', 'T5435_gcc.c']), when(arch('powerpc64') or arch('powerpc64le'), expect_broken(11259))], - run_command, ['$MAKE -s --no-print-directory T5435_v_gcc']) + makefile_test, ['T5435_v_gcc']) test('T5435_dyn_asm', [extra_files(['T5435.hs', 'T5435_asm.c']), check_stdout(checkDynAsm)], - run_command, ['$MAKE -s --no-print-directory T5435_dyn_asm']) -test('T5435_dyn_gcc', extra_files(['T5435.hs', 'T5435_gcc.c']) , run_command, ['$MAKE -s --no-print-directory T5435_dyn_gcc']) + makefile_test, ['T5435_dyn_asm']) +test('T5435_dyn_gcc', extra_files(['T5435.hs', 'T5435_gcc.c']) , makefile_test, ['T5435_dyn_gcc']) test('T5993', extra_run_opts('+RTS -k8 -RTS'), compile_and_run, ['']) @@ -235,7 +235,7 @@ test('T6006', [ omit_ways(prof_ways + ['ghci']), # needs it. compile_and_run, ['T6006_c.c -no-hs-main']) -test('T7037', [], run_command, ['$MAKE -s --no-print-directory T7037']) +test('T7037', [], makefile_test, ['T7037']) test('T7087', exit_code(1), compile_and_run, ['']) test('T7160', normal, compile_and_run, ['']) @@ -277,7 +277,7 @@ test('T8035', normal, compile_and_run, ['']) test('linker_unload', [extra_files(['LinkerUnload.hs', 'Test.hs']), when(arch('powerpc64') or arch('powerpc64le'), expect_broken(11259))], - run_command, ['$MAKE -s --no-print-directory linker_unload']) + makefile_test, ['linker_unload']) test('T8209', [ req_smp, only_ways(threaded_ways), ignore_stdout ], compile_and_run, ['']) @@ -328,16 +328,13 @@ test('overflow2', [ exit_code(251) ], compile_and_run, ['']) test('overflow3', [ exit_code(251) ], compile_and_run, ['']) test('linker_error1', [extra_files(['linker_error.c']), - ignore_stderr], run_command, - ['$MAKE -s --no-print-directory linker_error1']) + ignore_stderr], makefile_test, ['linker_error1']) test('linker_error2', [extra_files(['linker_error.c']), - ignore_stderr], run_command, - ['$MAKE -s --no-print-directory linker_error2']) + ignore_stderr], makefile_test, ['linker_error2']) test('linker_error3', [extra_files(['linker_error.c']), - ignore_stderr], run_command, - ['$MAKE -s --no-print-directory linker_error3']) + ignore_stderr], makefile_test, ['linker_error3']) def grep_stderr(pattern): def wrapper(cmd, pattern=pattern): @@ -387,14 +384,12 @@ test('T10904', [ omit_ways(['ghci']), extra_run_opts('20000') ], test('T10728', [extra_run_opts('+RTS -maxN3 -RTS'), only_ways(['threaded2'])], compile_and_run, ['']) -test('T9405', [when(msys(), expect_broken(12714))], run_command, - ['$MAKE -s --no-print-directory T9405']) +test('T9405', [when(msys(), expect_broken(12714))], makefile_test, ['T9405']) test('T11788', when(ghc_dynamic(), skip), - run_command, ['$MAKE -s --no-print-directory T11788']) + makefile_test, ['T11788']) -test('T10296a', [req_smp], run_command, - ['$MAKE -s --no-print-directory T10296a']) +test('T10296a', [req_smp], makefile_test, ['T10296a']) test('T10296b', [only_ways('threaded2')], compile_and_run, ['']) @@ -403,10 +398,10 @@ test('numa001', [ extra_run_opts('8'), unless(unregisterised(), extra_ways(['deb test('T12497', [ unless(opsys('mingw32'), skip) ], - run_command, ['$MAKE -s --no-print-directory T12497']) + makefile_test, ['T12497']) test('T13617', [ unless(opsys('mingw32'), skip)], - run_command, ['$MAKE -s --no-print-directory T13617']) + makefile_test, ['T13617']) # This test sometimes produces out of sequence samples in the profasm way, but # not reliably, so we just skip it. See ticket #15065. @@ -421,8 +416,7 @@ test('T13894', normal, compile_and_run, ['']) # this test fails with the profasm way on some machines but not others, # so we just skip it. 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('T14695', [normal, ignore_stderr], makefile_test, ['T14695']) test('T14702', [ ignore_stdout , when(unregisterised(), skip) , only_ways(['threaded1', 'threaded2']) @@ -431,8 +425,7 @@ test('T14702', [ ignore_stdout , compile_and_run, ['']) test('T14900', normal, compile_and_run, ['-package ghc-compact']) -test('InternalCounters', normal, run_command, - ['$MAKE -s --no-print-directory InternalCounters']) +test('InternalCounters', normal, makefile_test, ['InternalCounters']) test('alloccounter1', normal, compile_and_run, [ # avoid allocating stack chunks, which counts as @@ -461,8 +454,7 @@ test('keep-cafs-fail', filter_stdout_lines('Evaluated a CAF|exit.*'), ignore_stderr, # on OS X the shell emits an "Abort trap" message to stderr ], - run_command, - ['$MAKE -s --no-print-directory KeepCafsFail']) + makefile_test, ['KeepCafsFail']) # Test the -fkeep-cafs flag test('keep-cafs', @@ -472,6 +464,5 @@ test('keep-cafs', when(platform('powerpc64le-unknown-linux'), expect_broken(11261)), when(opsys('freebsd'), expect_broken(16035)), ], - run_command, - ['$MAKE -s --no-print-directory KeepCafs']) + makefile_test, ['KeepCafs']) |