Commit c7dd812d authored by Simon Peyton Jones's avatar Simon Peyton Jones
Browse files

Merge branch 'master' of http://darcs.haskell.org/testsuite

Conflicts:
	tests/ghci/scripts/all.T
parents 29ac8506 93cd6985
......@@ -62,7 +62,7 @@ test('allowinterrupt001', normal, compile_and_run, [''])
# try hard to provoke the error by running the test 100 times
test('5558',
[ only_ways(['threaded2']),
cmd_wrapper(lambda c: 'for i in `seq 1 100`; do ' + c + '; done') ],
cmd_wrapper(lambda c: 'for i in `seq 1 100`; do ' + c + ' || break; done') ],
compile_and_run, [''])
# -----------------------------------------------------------------------------
......
<interactive>:3:1:
Not in scope: `git'
Perhaps you meant `it' (line 2)
<interactive>:5:1:
Not in scope: `fit'
Perhaps you meant one of these:
`it' (line 4), `fst' (imported from Prelude)
......@@ -107,3 +107,4 @@ test('T5545', normal, ghci_script, ['T5545.script'])
test('T5557', normal, ghci_script, ['T5557.script'])
test('T5566', normal, ghci_script, ['T5566.script'])
test('GhciKinds', normal, ghci_script, ['GhciKinds.script'])
test('T5564', normal, ghci_script, ['T5564.script'])
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment