diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-05-17 14:35:44 +0100 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-05-17 14:35:44 +0100 |
| commit | 5888f61486048d41e7ca2a324d784c78fc9c19f1 (patch) | |
| tree | 575b66e13cb3fc759268a4b5486aa9492865438e /testsuite/driver | |
| parent | 600726c4dc96130e5bfefa9b69966e624992a547 (diff) | |
| download | haskell-5888f61486048d41e7ca2a324d784c78fc9c19f1.tar.gz | |
Make test cleaning a little more consistent
Diffstat (limited to 'testsuite/driver')
| -rw-r--r-- | testsuite/driver/testlib.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py index d804e2fffa..d9a4905358 100644 --- a/testsuite/driver/testlib.py +++ b/testsuite/driver/testlib.py @@ -625,14 +625,12 @@ def test_common_work (name, opts, func, args): skiptest (name,way) if getTestOpts().cleanup != '' and (config.clean_only or do_ways != []): + pretest_cleanup(name) clean(map (lambda suff: name + suff, ['', '.exe', '.exe.manifest', '.genscript', '.stderr.normalised', '.stdout.normalised', - '.run.stderr', '.run.stdout', '.run.stderr.normalised', '.run.stdout.normalised', - '.comp.stderr', '.comp.stdout', '.comp.stderr.normalised', '.comp.stdout.normalised', - '.interp.stderr', '.interp.stdout', '.interp.stderr.normalised', '.interp.stdout.normalised', '.stats', '.comp.stats', '.hi', '.o', '.prof', '.exe.prof', '.hc', @@ -2080,10 +2078,14 @@ def pretest_cleanup(name): pass os.mkdir(odir) + rm_no_fail(qualify(name,'interp.stderr')) + rm_no_fail(qualify(name,'interp.stdout')) rm_no_fail(qualify(name,'comp.stderr')) + rm_no_fail(qualify(name,'comp.stdout')) rm_no_fail(qualify(name,'run.stderr')) rm_no_fail(qualify(name,'run.stdout')) - rm_no_fail(qualify(name,'tix')) # remove the old tix file + rm_no_fail(qualify(name,'tix')) + rm_no_fail(qualify(name,'exe.tix')) # simple_build zaps the following: # rm_nofail(qualify("o")) # rm_nofail(qualify("")) |