Fixes for spaces in paths
authorIan Lynagh <igloo@earth.li>
Tue, 13 Oct 2009 11:58:08 +0000 (11:58 +0000)
committerIan Lynagh <igloo@earth.li>
Tue, 13 Oct 2009 11:58:08 +0000 (11:58 +0000)
testsuite/config/ghc
testsuite/mk/test.mk

index 0954c9d..f055592 100644 (file)
@@ -100,7 +100,8 @@ config.way_rts_flags = {
        }
 
 def get_compiler_info():
-    h = os.popen(config.compiler + ' --numeric-version', 'r')
+    # This should really not go through the shell
+    h = os.popen('"' + config.compiler + '" --numeric-version', 'r')
     v = h.read()
     h.close()
     v = re.sub('[\r\n]', '', v)
index 47cf2ea..eb7c600 100644 (file)
@@ -91,21 +91,21 @@ endif
 RUNTEST_OPTS +=  \
        --rootdir=. \
        --config=$(CONFIG) \
-       -e config.confdir=\"$(CONFIGDIR)\" \
-       -e config.compiler=\"$(TEST_HC)\" \
-       -e config.compiler_always_flags.append"(\"$(EXTRA_HC_OPTS)\")" \
-       -e config.ghc_pkg=\"$(GHC_PKG)\" \
-       -e config.hp2ps=\"$(HP2PS_ABS)\" \
-       -e config.hpc=\"$(HPC)\" \
-       -e config.gs=\"$(GS)\" \
-       -e config.platform=\"$(TARGETPLATFORM)\" \
-       -e config.os=\"$(TargetOS_CPP)\" \
-       -e config.wordsize=\"$(WORDSIZE)\" \
-       -e default_testopts.cleanup=\"$(CLEANUP)\" \
-       -e config.timeout="int($(TIMEOUT)) or config.timeout" \
-       -e config.timeout_prog=\"$(TIMEOUT_PROGRAM)\" \
-       -e config.exeext=\"$(exeext)\" \
-       -e config.top=\"$(TOP_ABS)\" \
+       -e 'config.confdir="$(CONFIGDIR)"' \
+       -e 'config.compiler="$(TEST_HC)"' \
+       -e 'config.compiler_always_flags.append("$(EXTRA_HC_OPTS)")' \
+       -e 'config.ghc_pkg="$(GHC_PKG)"' \
+       -e 'config.hp2ps="$(HP2PS_ABS)"' \
+       -e 'config.hpc="$(HPC)"' \
+       -e 'config.gs="$(GS)"' \
+       -e 'config.platform="$(TARGETPLATFORM)"' \
+       -e 'config.os="$(TargetOS_CPP)"' \
+       -e 'config.wordsize="$(WORDSIZE)"' \
+       -e 'default_testopts.cleanup="$(CLEANUP)"' \
+       -e 'config.timeout="int($(TIMEOUT)) or config.timeout"' \
+       -e 'config.timeout_prog="$(TIMEOUT_PROGRAM)"' \
+       -e 'config.exeext="$(exeext)"' \
+       -e 'config.top="$(TOP_ABS)"' \
        $(EXTRA_RUNTEST_OPTS)
 
 ifeq "$(fast)" "YES"