diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-02-03 19:25:54 +0000 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-02-03 19:25:54 +0000 |
| commit | 4200e0aa9f94b15b0d6bf9c732c56c1a11bcfd97 (patch) | |
| tree | 88266efe3cb4cc5b8288917be812832eb9668d78 /testsuite/tests/rts | |
| parent | 8005af165c5974ddd92ea017f1ce6b41465c0c7f (diff) | |
| download | haskell-4200e0aa9f94b15b0d6bf9c732c56c1a11bcfd97.tar.gz | |
Tidy up some tests
We now use pre_cmd rather than cmd_prefix wherever possible.
Also, pass "-s --no-print-directory" whenever we use pre_cmd.
Diffstat (limited to 'testsuite/tests/rts')
| -rw-r--r-- | testsuite/tests/rts/all.T | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/testsuite/tests/rts/all.T b/testsuite/tests/rts/all.T index 50c6b3b003..00f9475f23 100644 --- a/testsuite/tests/rts/all.T +++ b/testsuite/tests/rts/all.T @@ -85,9 +85,9 @@ test('T2615', if_os('darwin', skip), # Solaris' linker does not support GNUish linker scripts if_os('solaris2', skip), - cmd_prefix('$MAKE T2615-prep && ' + - # Add current directory to dlopen search path - 'LD_LIBRARY_PATH=$LD_LIBRARY_PATH:. '), + pre_cmd('$MAKE -s --no-print-directory T2615-prep'), + # Add current directory to dlopen search path + cmd_prefix('LD_LIBRARY_PATH=$LD_LIBRARY_PATH:. '), extra_clean(['libfoo_T2615.so', 'libfoo_T2615.o'])], compile_and_run, ['-package ghc']) @@ -106,7 +106,8 @@ test('T4059', # Test for #4274 test('exec_signals', [ if_os('mingw32', skip), - cmd_prefix('$MAKE exec_signals-prep && ./exec_signals_prepare'), + pre_cmd('$MAKE -s --no-print-directory exec_signals-prep'), + cmd_prefix('./exec_signals_prepare'), extra_clean(['exec_signals_child', 'exec_signals_prepare']) ], compile_and_run, ['']) @@ -136,7 +137,7 @@ test('T5993', extra_run_opts('+RTS -k8 -RTS'), compile_and_run, ['']) test('T6006', [ omit_ways(prof_ways + ['ghci']), extra_clean(['T6006_c.o']), - compile_cmd_prefix('$MAKE T6006_setup && ') ], + pre_cmd('$MAKE -s --no-print-directory T6006_setup') ], # The T6006_setup hack is to ensure that we generate # T6006_stub.h before compiling T6006_c.c, which # needs it. @@ -154,7 +155,7 @@ test('T7040', [ extra_clean(['T7040_c.o']), omit_ways(['ghci']) ], compile_and_run, ['T7040_c.c']) test('T7040_ghci', [ only_ways(['ghci']), - cmd_prefix('$MAKE T7040_ghci_setup && '), + pre_cmd('$MAKE -s --no-print-directory T7040_ghci_setup'), extra_clean(['T7040_ghci_c.o']) ], compile_and_run, ['T7040_ghci_c.o']) |