summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Miedema <thomasmiedema@gmail.com>2016-06-29 13:16:05 +0200
committerThomas Miedema <thomasmiedema@gmail.com>2016-06-29 13:17:02 +0200
commit848e3ceb881ef5a5bbfe23965b75d22f96a21229 (patch)
treeb93ab2a996623160a03cafe25237162841643076
parent2e9079ff2be2bbd65e399ef68b46439dbde04961 (diff)
downloadhaskell-848e3ceb881ef5a5bbfe23965b75d22f96a21229.tar.gz
Testsuite: fixes for python2.6 support
-rw-r--r--testsuite/driver/testlib.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py
index 6d4d77c70c..79ac62b76c 100644
--- a/testsuite/driver/testlib.py
+++ b/testsuite/driver/testlib.py
@@ -1236,7 +1236,7 @@ def simple_run(name, way, prog, extra_run_opts):
def rts_flags(way):
args = config.way_rts_flags.get(way, [])
- return '+RTS {} -RTS'.format(' '.join(args)) if args else ''
+ return '+RTS {0} -RTS'.format(' '.join(args)) if args else ''
# -----------------------------------------------------------------------------
# Run a program in the interpreter and check its output
@@ -1898,9 +1898,9 @@ def summary(t, file, short=False):
file.write('WARNING: Testsuite run was terminated early\n')
def printUnexpectedTests(file, testInfoss):
- unexpected = {name for testInfos in testInfoss
+ unexpected = set(name for testInfos in testInfoss
for (_, name, _, _) in testInfos
- if not name.endswith('.T')}
+ if not name.endswith('.T'))
if unexpected:
file.write('Unexpected results from:\n')
file.write('TEST="' + ' '.join(unexpected) + '"\n')