diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-01-30 10:05:19 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2019-01-30 10:05:19 -0500 |
| commit | 172a59335fa6c76b17fb6795e87fbc7fcfd198e6 (patch) | |
| tree | 6e5e940cb2c6ae9110807fa0d637a280c63b4220 /testsuite/tests/stranal | |
| parent | 76c8fd674435a652c75a96c85abbf26f1f221876 (diff) | |
| download | haskell-172a59335fa6c76b17fb6795e87fbc7fcfd198e6.tar.gz | |
Revert "Batch merge"
This reverts commit 76c8fd674435a652c75a96c85abbf26f1f221876.
Diffstat (limited to 'testsuite/tests/stranal')
| -rw-r--r-- | testsuite/tests/stranal/should_compile/all.T | 5 | ||||
| -rw-r--r-- | testsuite/tests/stranal/should_run/all.T | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/testsuite/tests/stranal/should_compile/all.T b/testsuite/tests/stranal/should_compile/all.T index c94065b2e4..38c15f2b30 100644 --- a/testsuite/tests/stranal/should_compile/all.T +++ b/testsuite/tests/stranal/should_compile/all.T @@ -36,7 +36,8 @@ test('T9208', when(compiler_debugged(), expect_broken(9208)), compile, ['']) test('T10694', [ grep_errmsg(r'Str=') ], compile, ['-dppr-cols=200 -ddump-simpl']) test('T11770', [ check_errmsg('OneShot') ], compile, ['-ddump-simpl']) -test('T13031', normal, makefile_test, []) +test('T13031', normal, run_command, + ['$MAKE -s --no-print-directory T13031']) test('T13077', normal, compile, ['']) test('T13077a', normal, compile, ['']) @@ -47,4 +48,4 @@ test('T13077a', normal, compile, ['']) # don't mention MutVar# and Array# anymore. test('T15627', [ grep_errmsg(r'(wmutVar|warray).*Int#') ], compile, ['-dppr-cols=200 -ddump-simpl']) -test('T16029', normal, makefile_test, []) +test('T16029', normal, run_command, ['$MAKE -s --no-print-directory T16029']) diff --git a/testsuite/tests/stranal/should_run/all.T b/testsuite/tests/stranal/should_run/all.T index f33adac932..4599c9e7d2 100644 --- a/testsuite/tests/stranal/should_run/all.T +++ b/testsuite/tests/stranal/should_run/all.T @@ -1,6 +1,6 @@ # Run this always as we compile the test with -O0 and -O1 and check that the # output is correct and the same in both cases. -test('T16197', normal, makefile_test, []) +test('T16197', normal, run_command, ['$MAKE -s --no-print-directory T16197']) # Run the rest only in optasm way (which implies -O), we're testing the # strictness analyser here |