[commit: ghc] ghc-7.10: Make testsuite driver Python 2.6 compatible again (b189a5a)

[git at git.haskell.org]

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

On branch  : ghc-7.10
Link       : http://ghc.haskell.org/trac/ghc/changeset/b189a5a3fb33caf8e23f6cdb329901f0675946ad/ghc

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

commit b189a5a3fb33caf8e23f6cdb329901f0675946ad
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Mon Mar 23 13:56:22 2015 +0100

    Make testsuite driver Python 2.6 compatible again
    
    Another bug in the #10164 series. Only Python 2.7 and up allow you to
    omit the positional argument specifiers in format strings.
    
    Test Plan: this fixes the Solaris builders
    
    Reviewed By: kgardas
    
    Differential Revision: https://phabricator.haskell.org/D750
    
    GHC Trac Issues: #10164
    
    (cherry picked from commit 0f03a843e7e740218f3ce3853f80de99b0ed6236)


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

b189a5a3fb33caf8e23f6cdb329901f0675946ad
 testsuite/driver/testlib.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py
index 29ceedb..af1dcdf 100644
--- a/testsuite/driver/testlib.py
+++ b/testsuite/driver/testlib.py
@@ -1294,11 +1294,11 @@ def simple_run( name, way, prog, args ):
         stdin_comes_from = ' <' + use_stdin
 
     if opts.combined_output:
-        redirection        = ' > {} 2>&1'.format(run_stdout)
-        redirection_append = ' >> {} 2>&1'.format(run_stdout)
+        redirection        = ' > {0} 2>&1'.format(run_stdout)
+        redirection_append = ' >> {0} 2>&1'.format(run_stdout)
     else:
-        redirection        = ' > {} 2> {}'.format(run_stdout, run_stderr)
-        redirection_append = ' >> {} 2>> {}'.format(run_stdout, run_stderr)
+        redirection        = ' > {0} 2> {1}'.format(run_stdout, run_stderr)
+        redirection_append = ' >> {0} 2>> {1}'.format(run_stdout, run_stderr)
 
     cmd = prog + ' ' + args + ' '  \
         + my_rts_flags + ' '       \
@@ -1406,11 +1406,11 @@ def interpreter_run( name, way, extra_hc_opts, compile_only, top_mod ):
                      config.way_flags(name)[way])
 
     if getTestOpts().combined_output:
-        redirection        = ' > {} 2>&1'.format(outname)
-        redirection_append = ' >> {} 2>&1'.format(outname)
+        redirection        = ' > {0} 2>&1'.format(outname)
+        redirection_append = ' >> {0} 2>&1'.format(outname)
     else:
-        redirection        = ' > {} 2> {}'.format(outname, errname)
-        redirection_append = ' >> {} 2>> {}'.format(outname, errname)
+        redirection        = ' > {0} 2> {1}'.format(outname, errname)
+        redirection_append = ' >> {0} 2>> {1}'.format(outname, errname)
 
     cmd = ('{{compiler}} {srcname} {flags} {extra_hc_opts} '
            '< {scriptname} {redirection}'