diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2020-12-16 15:01:12 -0500 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-12-18 05:54:56 -0500 |
| commit | c53b38dd5c1e38517a0c686d2aa9f8187629299c (patch) | |
| tree | 00d89b491a0bfbe8126ac5ed81326352a904eeee | |
| parent | 3e9b745253cdf7299a692a95dceac87d6d0ff82f (diff) | |
| download | haskell-c53b38dd5c1e38517a0c686d2aa9f8187629299c.tar.gz | |
testsuite: Fix two shell quoting issues
Fixes two ancient bugs in the testsuite driver makefiles due to
insufficient quoting. I have no idea how these went unnoticed for so
long.
Thanks to @tomjaguarpaw for testing.
| -rw-r--r-- | testsuite/mk/boilerplate.mk | 2 | ||||
| -rw-r--r-- | testsuite/mk/test.mk | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/testsuite/mk/boilerplate.mk b/testsuite/mk/boilerplate.mk index 5cdc40e68c..6ccc43ed8d 100644 --- a/testsuite/mk/boilerplate.mk +++ b/testsuite/mk/boilerplate.mk @@ -244,7 +244,7 @@ ifeq "$(ghc_config_mk)" "" ghc_config_mk = $(TOP)/mk/ghcconfig$(subst $(space),_,$(subst :,_,$(subst /,_,$(subst \,_,$(TEST_HC))))).mk $(ghc_config_mk) : $(TOP)/mk/ghc-config - $(TOP)/mk/ghc-config "$(TEST_HC)" >"$@"; if [ $$? != 0 ]; then $(RM) "$@"; exit 1; fi + $(TOP)/mk/ghc-config "$(TEST_HC)" >"$@"; if [ "$$?" != "0" ]; then $(RM) "$@"; exit 1; fi # If the ghc-config fails, remove $@, and fail endif diff --git a/testsuite/mk/test.mk b/testsuite/mk/test.mk index cc30266829..a7276207f5 100644 --- a/testsuite/mk/test.mk +++ b/testsuite/mk/test.mk @@ -100,9 +100,9 @@ RUNTEST_OPTS += -e "config.leading_underscore=False" endif GHC_PRIM_LIBDIR := $(subst library-dirs: ,,$(shell "$(GHC_PKG)" field ghc-prim library-dirs --simple-output)) -HAVE_VANILLA := $(shell if [ -f $(subst \,/,$(GHC_PRIM_LIBDIR))/GHC/PrimopWrappers.hi ]; then echo YES; else echo NO; fi) -HAVE_DYNAMIC := $(shell if [ -f $(subst \,/,$(GHC_PRIM_LIBDIR))/GHC/PrimopWrappers.dyn_hi ]; then echo YES; else echo NO; fi) -HAVE_PROFILING := $(shell if [ -f $(subst \,/,$(GHC_PRIM_LIBDIR))/GHC/PrimopWrappers.p_hi ]; then echo YES; else echo NO; fi) +HAVE_VANILLA := $(shell if [ -f "$(subst \,/,$(GHC_PRIM_LIBDIR))/GHC/PrimopWrappers.hi" ]; then echo YES; else echo NO; fi) +HAVE_DYNAMIC := $(shell if [ -f "$(subst \,/,$(GHC_PRIM_LIBDIR))/GHC/PrimopWrappers.dyn_hi" ]; then echo YES; else echo NO; fi) +HAVE_PROFILING := $(shell if [ -f "$(subst \,/,$(GHC_PRIM_LIBDIR))/GHC/PrimopWrappers.p_hi" ]; then echo YES; else echo NO; fi) HAVE_GDB := $(shell if gdb --version > /dev/null 2> /dev/null; then echo YES; else echo NO; fi) HAVE_READELF := $(shell if readelf --version > /dev/null 2> /dev/null; then echo YES; else echo NO; fi) |