[commit: ghc] master: Do not share T9878.hs between test T9878 and T9878b (3568bf3)

git at git.haskell.org git at git.haskell.org
Wed Feb 11 11:16:35 UTC 2015


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/3568bf3fe76b95208f650f356a0668113838d842/ghc

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

commit 3568bf3fe76b95208f650f356a0668113838d842
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Feb 11 10:30:05 2015 +0000

    Do not share T9878.hs between test T9878 and T9878b
    
    I think the sharing was giving a race condition in the test suite;
    I got a failure from validate which went away when I ran the tests
    individually.


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

3568bf3fe76b95208f650f356a0668113838d842
 testsuite/tests/ghci/scripts/{T9878.hs => T9878b.hs} | 2 +-
 testsuite/tests/ghci/scripts/T9878b.script           | 2 +-
 testsuite/tests/ghci/scripts/all.T                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/testsuite/tests/ghci/scripts/T9878.hs b/testsuite/tests/ghci/scripts/T9878b.hs
similarity index 81%
copy from testsuite/tests/ghci/scripts/T9878.hs
copy to testsuite/tests/ghci/scripts/T9878b.hs
index fceceda..baa0da0 100644
--- a/testsuite/tests/ghci/scripts/T9878.hs
+++ b/testsuite/tests/ghci/scripts/T9878b.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE StaticPointers #-}
-module T9878 where
+module T9878b where
 
 import GHC.StaticPtr
 
diff --git a/testsuite/tests/ghci/scripts/T9878b.script b/testsuite/tests/ghci/scripts/T9878b.script
index a855858..63765af 100644
--- a/testsuite/tests/ghci/scripts/T9878b.script
+++ b/testsuite/tests/ghci/scripts/T9878b.script
@@ -1,2 +1,2 @@
-:l T9878.hs
+:l T9878b.hs
 f
diff --git a/testsuite/tests/ghci/scripts/all.T b/testsuite/tests/ghci/scripts/all.T
index fbcdb25..1decf78 100755
--- a/testsuite/tests/ghci/scripts/all.T
+++ b/testsuite/tests/ghci/scripts/all.T
@@ -204,5 +204,5 @@ test('T9878',
     ghci_script, ['T9878.script'])
 test('T9878b',
     [ extra_run_opts('-fobject-code'),
-      extra_clean(['T9878.hi','T9878.o'])],
+      extra_clean(['T9878b.hi','T9878b.o'])],
     ghci_script, ['T9878b.script'])



More information about the ghc-commits mailing list