[commit: ghc] master: Fix test suite race on T5462 (solves intermittent T5462Yes1/T5462Yes2/T5462No1 failure) (06eaa64)

git at git.haskell.org git at git.haskell.org
Tue Dec 2 11:11:55 UTC 2014


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/06eaa64d49a7c5a38018c89d8a8c9ab2be8b569a/ghc

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

commit 06eaa64d49a7c5a38018c89d8a8c9ab2be8b569a
Author: Edward Z. Yang <ezyang at cs.stanford.edu>
Date:   Tue Dec 2 03:12:14 2014 -0800

    Fix test suite race on T5462 (solves intermittent T5462Yes1/T5462Yes2/T5462No1 failure)
    
    Signed-off-by: Edward Z. Yang <ezyang at cs.stanford.edu>


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

06eaa64d49a7c5a38018c89d8a8c9ab2be8b569a
 testsuite/tests/generics/T5462No1.stderr | 4 ++--
 testsuite/tests/generics/all.T           | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/testsuite/tests/generics/T5462No1.stderr b/testsuite/tests/generics/T5462No1.stderr
index 9deb08a..9a4418a 100644
--- a/testsuite/tests/generics/T5462No1.stderr
+++ b/testsuite/tests/generics/T5462No1.stderr
@@ -1,5 +1,5 @@
-[1 of 2] Compiling GFunctor         ( GFunctor/GFunctor.hs, GFunctor/GFunctor.o )
-[2 of 2] Compiling T5462No1         ( T5462No1.hs, T5462No1.o )
+[1 of 2] Compiling GFunctor         ( GFunctor/GFunctor.hs, T5462No1/GFunctor.o )
+[2 of 2] Compiling T5462No1         ( T5462No1.hs, T5462No1/T5462No1.o )
 
 T5462No1.hs:24:42:
     Can't make a derived instance of ‘GFunctor F’:
diff --git a/testsuite/tests/generics/all.T b/testsuite/tests/generics/all.T
index 694f214..d959d0c 100644
--- a/testsuite/tests/generics/all.T
+++ b/testsuite/tests/generics/all.T
@@ -19,9 +19,9 @@ test('GenCannotDoRep1_6', normal, compile_fail, [''])
 test('GenCannotDoRep1_7', normal, compile_fail, [''])
 test('GenCannotDoRep1_8', normal, compile_fail, [''])
 
-test('T5462Yes1', normal, multimod_compile_and_run, ['T5462Yes1', '-iGEq -iGEnum -iGFunctor'])
-test('T5462Yes2', normal, multimod_compile_and_run, ['T5462Yes2', '-iGFunctor'])
-test('T5462No1', normal, multimod_compile_fail, ['T5462No1', '-iGFunctor'])
+test('T5462Yes1', normal, multimod_compile_and_run, ['T5462Yes1', '-iGEq -iGEnum -iGFunctor -outputdir=out_T5462Yes1'])
+test('T5462Yes2', normal, multimod_compile_and_run, ['T5462Yes2', '-iGFunctor -outputdir=out_T5462Yes2'])
+test('T5462No1', normal, multimod_compile_fail, ['T5462No1', '-iGFunctor -outputdir=T5462No1'])
 
 test('T5884',      normal, compile, [''])
 test('GenNewtype', normal, compile_and_run, [''])



More information about the ghc-commits mailing list