[commit: ghc] master: Fix testsuite driver for a profiling compiler (beee618)

git at git.haskell.org git at git.haskell.org
Mon Mar 16 17:39:32 UTC 2015


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

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

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

commit beee618c4ab8f725acd4dce3ef8a0d4ce84bb6ec
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Sun Mar 15 21:06:39 2015 +0100

    Fix testsuite driver for a profiling compiler
    
    This should have been part of commit 5258566ee5c8, to allow expansion of
    '{hp2ps}' in a command string to `config.hp2ps`.
    
    Reviewed by: austin
    
    Differential Revision: https://phabricator.haskell.org/D734


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

beee618c4ab8f725acd4dce3ef8a0d4ce84bb6ec
 testsuite/driver/testlib.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py
index 1d3ef11..59230ab 100644
--- a/testsuite/driver/testlib.py
+++ b/testsuite/driver/testlib.py
@@ -1828,6 +1828,9 @@ def rawSystemWithTimeout(cmd_and_args):
 # Then, when using the native Python, os.system will invoke the cmd shell
 
 def runCmd( cmd ):
+    # Format cmd using config. Example: cmd='{hpc} report A.tix'
+    cmd = cmd.format(**config.__dict__)
+
     if_verbose( 3, cmd )
     r = 0
     if config.os == 'mingw32':



More information about the ghc-commits mailing list