[commit: ghc] master: Testsuite: fixes for python2.6 support (848e3ce)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/848e3ceb881ef5a5bbfe23965b75d22f96a21229/ghc

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

commit 848e3ceb881ef5a5bbfe23965b75d22f96a21229
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Wed Jun 29 13:16:05 2016 +0200

    Testsuite: fixes for python2.6 support


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

848e3ceb881ef5a5bbfe23965b75d22f96a21229
 testsuite/driver/testlib.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py
index 6d4d77c..79ac62b 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')