summaryrefslogtreecommitdiff
path: root/testsuite/tests
diff options
context:
space:
mode:
authorDimitrios Vytiniotis <dimitris@microsoft.com>2012-07-19 14:36:01 +0200
committerDimitrios Vytiniotis <dimitris@microsoft.com>2012-07-19 14:36:01 +0200
commit577b9dcb363f30b1cc3a164c7305f0788992b9ba (patch)
treedb103b2e3d7b8ef2a08372c7a5a3e32523b219d3 /testsuite/tests
parenta631a13deaaa75b198f1d53f01ad0d3e49e4686f (diff)
parent410ad380ce361c0cc0ae24822cf702adb66d4004 (diff)
downloadhaskell-577b9dcb363f30b1cc3a164c7305f0788992b9ba.tar.gz
Merge branch 'master' of http://darcs.haskell.org/testsuite
Diffstat (limited to 'testsuite/tests')
-rw-r--r--testsuite/tests/concurrent/should_run/all.T4
-rw-r--r--testsuite/tests/perf/compiler/T4007.stdout (renamed from testsuite/tests/perf/compiler/T4007.stderr)0
2 files changed, 3 insertions, 1 deletions
diff --git a/testsuite/tests/concurrent/should_run/all.T b/testsuite/tests/concurrent/should_run/all.T
index fc5ad45181..47d2a78cc3 100644
--- a/testsuite/tests/concurrent/should_run/all.T
+++ b/testsuite/tests/concurrent/should_run/all.T
@@ -60,7 +60,9 @@ 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 + ' || break; done') ],
+ cmd_wrapper(
+ lambda c: "for i in %s; do %s || break; done" %
+ (" ".join(str(i) for i in range(1,101)), c)) ],
compile_and_run, [''])
test('5421', normal, compile_and_run, [''])
diff --git a/testsuite/tests/perf/compiler/T4007.stderr b/testsuite/tests/perf/compiler/T4007.stdout
index 9b825fd518..9b825fd518 100644
--- a/testsuite/tests/perf/compiler/T4007.stderr
+++ b/testsuite/tests/perf/compiler/T4007.stdout