Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master
http://hackage.haskell.org/trac/ghc/changeset/4f21b8b44fbe4fa3e17947c2fce63945c6421cc9 >--------------------------------------------------------------- commit 4f21b8b44fbe4fa3e17947c2fce63945c6421cc9 Author: Simon Marlow <[email protected]> Date: Fri Jul 6 10:40:49 2012 +0100 Fix T5975a/b conflict when run in parallel Also make T5975b actually load the file, it looks like this was an oversight when the test was created (it wasn't doing anything useful at all). >--------------------------------------------------------------- tests/ghci/scripts/T5975a.script | 2 +- tests/ghci/scripts/all.T | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/ghci/scripts/T5975a.script b/tests/ghci/scripts/T5975a.script index ea0d649..63f7a6c 100644 --- a/tests/ghci/scripts/T5975a.script +++ b/tests/ghci/scripts/T5975a.script @@ -1 +1 @@ -:load föøbà r.hs +:load föøbà r1.hs diff --git a/tests/ghci/scripts/all.T b/tests/ghci/scripts/all.T index e0b7560..12bc870 100755 --- a/tests/ghci/scripts/all.T +++ b/tests/ghci/scripts/all.T @@ -116,12 +116,13 @@ test('T5820', normal, ghci_script, ['T5820.script']) test('T5836', normal, ghci_script, ['T5836.script']) test('T5979', normalise_slashes, ghci_script, ['T5979.script']) test('T5975a', - [pre_cmd('touch föøbà r.hs'), - clean_cmd('rm föøbà r.hs')], + [pre_cmd('touch föøbà r1.hs'), + clean_cmd('rm föøbà r1.hs')], ghci_script, ['T5975a.script']) test('T5975b', - [pre_cmd('touch föøbà r.hs'), - clean_cmd('rm föøbà r.hs')], + [pre_cmd('touch föøbà r2.hs'), + clean_cmd('rm föøbà r2.hs'), + extra_hc_opts('föøbà r2.hs')], ghci_script, ['T5975b.script']) test('T6027ghci', normal, ghci_script, ['T6027ghci.script'])
_______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
