diff options
| author | Thomas Miedema <thomasmiedema@gmail.com> | 2015-03-06 21:55:36 +0100 |
|---|---|---|
| committer | Thomas Miedema <thomasmiedema@gmail.com> | 2015-03-11 18:59:53 +0100 |
| commit | 5258566ee5c89aa757b0cf1433169346319c018f (patch) | |
| tree | 809dbd1eb47e4f864b33e4fb266610c781d3b89b /testsuite/config | |
| parent | 842028b4a624e639dc9ee9a4f92fc208c8206e3f (diff) | |
| download | haskell-5258566ee5c89aa757b0cf1433169346319c018f.tar.gz | |
Cleanup test framework string formatting
* Use format strings instead of string concatenation.
* Wrap `config.compiler`, `config.hpc` etc. in quotes in `mk/test.mk`, so we
don't have to in .T scripts and driver/testlib.py.
Update hpc submodule (test cleanup)
Reviewers: austin
Differential Revision: https://phabricator.haskell.org/D718
Diffstat (limited to 'testsuite/config')
| -rw-r--r-- | testsuite/config/ghc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/testsuite/config/ghc b/testsuite/config/ghc index 10565dd914..c208838268 100644 --- a/testsuite/config/ghc +++ b/testsuite/config/ghc @@ -165,12 +165,12 @@ llvm_ways = [x[0] for x in config.way_flags('dummy_name').items() def get_compiler_info(): # This should really not go through the shell - h = os.popen('"' + config.compiler + '" --info', 'r') + h = os.popen(config.compiler + ' --info', 'r') s = h.read() s = re.sub('[\r\n]', '', s) h.close() compilerInfoDict = dict(eval(s)) - h = os.popen('"' + config.compiler + '" +RTS --info', 'r') + h = os.popen(config.compiler + ' +RTS --info', 'r') s = h.read() s = re.sub('[\r\n]', '', s) h.close() |