diff options
| author | Ian Lynagh <igloo@earth.li> | 2009-12-19 17:11:08 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2009-12-19 17:11:08 +0000 |
| commit | 6436bddc49ace48faa832874f3551b41853a3aba (patch) | |
| tree | 12fe1856ca57205a7100ebca5d0c25d4a1d5c725 /testsuite/tests/ghc-regress | |
| parent | c7b4f366d72b541655d887f2dd2a36103e58eff5 (diff) | |
| download | haskell-6436bddc49ace48faa832874f3551b41853a3aba.tar.gz | |
Add you more clean_cmd's
Diffstat (limited to 'testsuite/tests/ghc-regress')
9 files changed, 34 insertions, 31 deletions
diff --git a/testsuite/tests/ghc-regress/driver/1372/all.T b/testsuite/tests/ghc-regress/driver/1372/all.T index 502438a0ad..cabf3c01f8 100644 --- a/testsuite/tests/ghc-regress/driver/1372/all.T +++ b/testsuite/tests/ghc-regress/driver/1372/all.T @@ -1,4 +1,5 @@ -test('1372', normal, - run_command, ['$MAKE -s --no-print-directory 1372']) -if default_testopts.cleanup != '': - runCmd('$MAKE -C ' + in_testdir('') + ' clean') +test('1372', + clean_cmd('$MAKE -s clean'), + run_command, + ['$MAKE -s --no-print-directory 1372']) + diff --git a/testsuite/tests/ghc-regress/driver/T3007/all.T b/testsuite/tests/ghc-regress/driver/T3007/all.T index b8cd585834..194097335d 100644 --- a/testsuite/tests/ghc-regress/driver/T3007/all.T +++ b/testsuite/tests/ghc-regress/driver/T3007/all.T @@ -1,4 +1,5 @@ -test('T3007', normal, - run_command, ['$MAKE -s --no-print-directory T3007']) -if default_testopts.cleanup != '': - runCmd('$MAKE -C ' + in_testdir('') + ' clean') +test('T3007', + clean_cmd('$MAKE -s clean'), + run_command, + ['$MAKE -s --no-print-directory T3007']) + diff --git a/testsuite/tests/ghc-regress/driver/dynamic_flags_001/all.T b/testsuite/tests/ghc-regress/driver/dynamic_flags_001/all.T index 26867d41ec..c487a0cb75 100644 --- a/testsuite/tests/ghc-regress/driver/dynamic_flags_001/all.T +++ b/testsuite/tests/ghc-regress/driver/dynamic_flags_001/all.T @@ -1,4 +1,6 @@ -test('dynamic_flags_001', skip_if_fast, run_command, ['$MAKE -s --no-print-directory dynamic_flags_001']) +test('dynamic_flags_001', + [skip_if_fast, + clean_cmd('$MAKE -s clean')], + run_command, + ['$MAKE -s --no-print-directory dynamic_flags_001']) -if default_testopts.cleanup != '': - runCmd('$MAKE -s -C ' + in_testdir('') + ' clean') diff --git a/testsuite/tests/ghc-regress/driver/recomp001/all.T b/testsuite/tests/ghc-regress/driver/recomp001/all.T index ad633d2eed..f3672fa2f8 100644 --- a/testsuite/tests/ghc-regress/driver/recomp001/all.T +++ b/testsuite/tests/ghc-regress/driver/recomp001/all.T @@ -1,4 +1,6 @@ -test('recomp001', skip_if_fast, run_command, ['$MAKE -s --no-print-directory recomp001']) +test('recomp001', + [skip_if_fast, + clean_cmd('$MAKE -s clean')], + run_command, + ['$MAKE -s --no-print-directory recomp001']) -if default_testopts.cleanup != '': - runCmd('$MAKE -C ' + in_testdir('') + ' clean') diff --git a/testsuite/tests/ghc-regress/driver/recomp002/all.T b/testsuite/tests/ghc-regress/driver/recomp002/all.T index 408ef3b4e7..5f8ddf5f1b 100644 --- a/testsuite/tests/ghc-regress/driver/recomp002/all.T +++ b/testsuite/tests/ghc-regress/driver/recomp002/all.T @@ -1,4 +1,6 @@ -test('recomp002', skip_if_fast, run_command, ['$MAKE -s --no-print-directory recomp002']) +test('recomp002', + [skip_if_fast, + clean_cmd('$MAKE -s clean')], + run_command, + ['$MAKE -s --no-print-directory recomp002']) -if default_testopts.cleanup != '': - runCmd('$MAKE -C ' + in_testdir('') + ' clean') diff --git a/testsuite/tests/ghc-regress/driver/recomp005/Makefile b/testsuite/tests/ghc-regress/driver/recomp005/Makefile index 287ad8c21b..3c30f5ee1f 100644 --- a/testsuite/tests/ghc-regress/driver/recomp005/Makefile +++ b/testsuite/tests/ghc-regress/driver/recomp005/Makefile @@ -3,14 +3,14 @@ include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/test.mk clean: - @rm -f *.o* - @rm -f *.hi* - @rm -f C.hs + rm -f *.o* + rm -f *.hi* + rm -f C.hs recomp005: clean cp C1.hs C.hs '$(TEST_HC)' -fglasgow-exts --make E.hs -O - @sleep 1 + sleep 1 cp C2.hs C.hs # Should recompile E, because C is now an orphan '$(TEST_HC)' -fglasgow-exts --make E.hs -O diff --git a/testsuite/tests/ghc-regress/driver/recomp005/all.T b/testsuite/tests/ghc-regress/driver/recomp005/all.T index 053aa2e167..d5d89b1712 100644 --- a/testsuite/tests/ghc-regress/driver/recomp005/all.T +++ b/testsuite/tests/ghc-regress/driver/recomp005/all.T @@ -1,6 +1,5 @@ test('recomp005', - skip_if_fast, + [skip_if_fast, + clean_cmd('$MAKE -s clean')], run_command, ['$MAKE -s --no-print-directory recomp005']) -if default_testopts.cleanup != '': - runCmd('$MAKE -C ' + in_testdir('') + ' clean') diff --git a/testsuite/tests/ghc-regress/module/base01/all.T b/testsuite/tests/ghc-regress/module/base01/all.T index 600f935777..5dce9b674e 100644 --- a/testsuite/tests/ghc-regress/module/base01/all.T +++ b/testsuite/tests/ghc-regress/module/base01/all.T @@ -1,9 +1,8 @@ setTestOpts(only_compiler_types(['ghc'])) -test('base01', normalise_slashes, +test('base01', + [normalise_slashes, + clean_cmd($MAKE -s clean')], run_command, ['$MAKE -s base01 --no-print-directory']) -if default_testopts.cleanup != '': - runCmd('$MAKE -s -C ' + in_testdir('') + ' clean') - diff --git a/testsuite/tests/ghc-regress/module/mod175/all.T b/testsuite/tests/ghc-regress/module/mod175/all.T index b49c695b05..8edbf0ae0f 100644 --- a/testsuite/tests/ghc-regress/module/mod175/all.T +++ b/testsuite/tests/ghc-regress/module/mod175/all.T @@ -6,6 +6,3 @@ test('mod175', run_command, ['$MAKE -s mod175']) -if default_testopts.cleanup != '': - runCmd('$MAKE -C ' + in_testdir('') + ' clean') - |