[commit: testsuite] master: Add extra cleaning (07dd177)

Ian Lynagh igloo at earth.li
Sat Aug 6 22:50:59 CEST 2011


Repository : ssh://darcs.haskell.org//srv/darcs/testsuite

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/07dd177d5e9528167bb3a13be9f582c413a85dfc

>---------------------------------------------------------------

commit 07dd177d5e9528167bb3a13be9f582c413a85dfc
Author: Ian Lynagh <igloo at earth.li>
Date:   Sat Aug 6 20:08:44 2011 +0100

    Add extra cleaning

>---------------------------------------------------------------

 tests/dph/dotp/dph-dotp.T           |    4 +++-
 tests/dph/primespj/dph-primespj.T   |    4 +++-
 tests/dph/quickhull/dph-quickhull.T |   12 +++++++++++-
 tests/parser/should_compile/all.T   |    4 +++-
 tests/perf/should_run/all.T         |    3 ++-
 5 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/tests/dph/dotp/dph-dotp.T b/tests/dph/dotp/dph-dotp.T
index 2ebab9d..ae43a61 100644
--- a/tests/dph/dotp/dph-dotp.T
+++ b/tests/dph/dotp/dph-dotp.T
@@ -2,6 +2,7 @@
 test    ('dph-dotp-opt' 
         , [ alone
           , skip_if_fast
+          , extra_clean(['Main.o', 'Main.hi', 'DotPVect.hi', 'DotPVect.o'])
           , reqlib('dph-par')
           , reqlib('dph-prim-par')
           , only_ways(['normal', 'threaded1', 'threaded2']) ] 
@@ -10,7 +11,8 @@ test    ('dph-dotp-opt'
           , '-Odph -fdph-par'])
 
 test    ('dph-dotp-fast' 
-        , [ reqlib('dph-par')
+        , [ extra_clean(['Main.o', 'Main.hi', 'DotPVect.hi', 'DotPVect.o'])
+          , reqlib('dph-par')
           , reqlib('dph-prim-par')
           , only_ways(['normal', 'threaded1', 'threaded2']) ] 
         , multimod_compile_and_run 
diff --git a/tests/dph/primespj/dph-primespj.T b/tests/dph/primespj/dph-primespj.T
index 4584904..6eef9af 100644
--- a/tests/dph/primespj/dph-primespj.T
+++ b/tests/dph/primespj/dph-primespj.T
@@ -2,6 +2,7 @@
 test    ('dph-primespj-opt' 
         , [ alone
           , skip_if_fast
+          , extra_clean(['Main.hi', 'Main.o', 'PrimesVect.hi', 'PrimesVect.o'])
           , reqlib('dph-par')
           , reqlib('dph-prim-par')
           , only_ways(['normal', 'threaded1', 'threaded2']) ] 
@@ -10,7 +11,8 @@ test    ('dph-primespj-opt'
           , '-Odph -fdph-par'])
 
 test    ('dph-primespj-fast' 
-        , [ reqlib('dph-par')
+        , [ extra_clean(['Main.hi', 'Main.o', 'PrimesVect.hi', 'PrimesVect.o'])
+          , reqlib('dph-par')
           , reqlib('dph-prim-par')
           , only_ways(['normal', 'threaded1', 'threaded2']) ] 
         , multimod_compile_and_run 
diff --git a/tests/dph/quickhull/dph-quickhull.T b/tests/dph/quickhull/dph-quickhull.T
index f1a1deb..addaf1d 100644
--- a/tests/dph/quickhull/dph-quickhull.T
+++ b/tests/dph/quickhull/dph-quickhull.T
@@ -2,6 +2,11 @@
 test    ('dph-quickhull-opt' 
         , [ alone
           , skip_if_fast
+          , extra_clean(['Main.hi', 'Main.o',
+                         'QuickHullVect.hi', 'QuickHullVect.o',
+                         'SVG.hi', 'SVG.o',
+                         'TestData.hi', 'TestData.o',
+                         'Types.hi', 'Types.o'])
           , reqlib('dph-par')
           , reqlib('dph-prim-par')
           , only_ways(['normal', 'threaded1', 'threaded2']) ] 
@@ -10,7 +15,12 @@ test    ('dph-quickhull-opt'
           , '-Odph -funfolding-use-threshold30 -fdph-par'])
 
 test    ('dph-quickhull-fast' 
-        , [ reqlib('dph-par')
+        , [ extra_clean(['Main.hi', 'Main.o',
+                         'QuickHullVect.hi', 'QuickHullVect.o',
+                         'SVG.hi', 'SVG.o',
+                         'TestData.hi', 'TestData.o',
+                         'Types.hi', 'Types.o'])
+          , reqlib('dph-par')
           , reqlib('dph-prim-par')
           , only_ways(['normal', 'threaded1', 'threaded2']) ] 
         , multimod_compile_and_run 
diff --git a/tests/parser/should_compile/all.T b/tests/parser/should_compile/all.T
index 328c065..0ac301e 100644
--- a/tests/parser/should_compile/all.T
+++ b/tests/parser/should_compile/all.T
@@ -91,4 +91,6 @@ test('mc15', normal, compile, [''])
 test('mc16', normal, compile, [''])
 test('EmptyDecls', normal, compile, [''])
 
-test('T5243', normal, multimod_compile, ['T5243',''])
+test('T5243', extra_clean(['T5243A.hi', 'T5243A.o']),
+     multimod_compile, ['T5243',''])
+
diff --git a/tests/perf/should_run/all.T b/tests/perf/should_run/all.T
index 0413397..5579a1a 100644
--- a/tests/perf/should_run/all.T
+++ b/tests/perf/should_run/all.T
@@ -54,7 +54,8 @@ test('T4321', omit_ways(['ghci']), compile_and_run, ['-O ' + sse2_opts])
 
 test('T3736', normal, run_command, ['$MAKE -s --no-print-directory T3736'])
 test('T3738',
-     [stats_num_field('peak_megabytes_allocated', 1,
+     [extra_clean(['T3738a.hi', 'T3738a.o']),
+      stats_num_field('peak_megabytes_allocated', 1,
                                                   1),
                                      # expected value: 1 (amd64/Linux)
       # expected value: 45648 (x86/Linux):





More information about the Cvs-ghc mailing list