diff options
| author | Thomas Miedema <thomasmiedema@gmail.com> | 2015-06-04 10:49:51 +0200 |
|---|---|---|
| committer | Thomas Miedema <thomasmiedema@gmail.com> | 2015-06-09 13:23:23 +0200 |
| commit | bb9967121f2383b857680b47b6bc20607f8fd1ff (patch) | |
| tree | bc60252f0beeff0fac29635c8603469043a5bc2c /testsuite/mk | |
| parent | 3b55659d4f54e503f4e550d762bc55a2650ed13d (diff) | |
| download | haskell-bb9967121f2383b857680b47b6bc20607f8fd1ff.tar.gz | |
Revert "The test runner now also works under the msys-native Python."
To make the test runner work under msys-native Python...
Commit 5258566ee5c89aa757b0cf1433169346319c018f broke the msys testsuite
driver (#10441). It changed the quoting of `config.compiler` from single
quotes to double quote, which turns out to not be compatible with what
the function `passThroughCmd` expected.
We could fix `passThroughCmd` to handle the case where `config.compiler`
is double quoted, and scatter some notes around to make sure the quoting
done in various places of the testsuite driver stay compatible.
Instead, this commit reverts 101c62e26286353dd3fac1ef54323529b64c9902,
which introdced the function `passThroughCmd` in the first place
(#9626). ezyang reports that doing this revert fixes the testsuite
driver for him using the the following version of msys2:
msys2-keyring r8.3864337-1
msys2-runtime 2.1.0.16351.cd3184b-1
msys2-runtime-devel 2.1.0.16351.cd3184b-1
msys2-w32api-headers 5.0.0.4456.c8b6742-1
msys2-w32api-runtime 5.0.0.4455.32db221-1
Ideally we'd know what minimum version of msys2 we require, but for now
this fix is better than nothing.
Only gintas ever reported the original problem, and he actually
mentioned shortly afterwards: "This may have been fixed by a recent
release of msys2, but I am not sure."
Differential Revision: https://phabricator.haskell.org/D952
Diffstat (limited to 'testsuite/mk')
| -rw-r--r-- | testsuite/mk/test.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/testsuite/mk/test.mk b/testsuite/mk/test.mk index 5b482059f1..644de5afaf 100644 --- a/testsuite/mk/test.mk +++ b/testsuite/mk/test.mk @@ -213,6 +213,8 @@ RUNTEST_OPTS += \ # function) would require another pair of (escaped) quotes, which interfers # with MinGW's magic path handling (see #10449, and # http://www.mingw.org/wiki/Posix_path_conversion). +# We use double instead of single quotes, which may or may not be important +# when using msys2 (#9626, #10441). quote_path = $(if $1,"$1") RUNTEST_OPTS += \ --config 'compiler=$(call quote_path,$(TEST_HC))' \ |