diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2021-11-29 16:15:36 +0000 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-12-01 03:11:45 -0500 |
| commit | c2f6cbef77203b7698f6484719ed9902f905496c (patch) | |
| tree | 57f03a6d665b07927173913293d7f38b9cb2d4bf /testsuite | |
| parent | 59b2794550611879362c7170d6005c6b4f08e3c5 (diff) | |
| download | haskell-c2f6cbef77203b7698f6484719ed9902f905496c.tar.gz | |
Fix several quoting issues in testsuite
This fixes the ./validate script on my machine.
I also took the step to add some linters which would catch problems like
these in future.
Fixes #20506
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/mk/test.mk | 2 | ||||
| -rw-r--r-- | testsuite/tests/driver/recompChangedPackage/Makefile | 4 | ||||
| -rw-r--r-- | testsuite/tests/haddock/haddock_testsuite/Makefile | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/testsuite/mk/test.mk b/testsuite/mk/test.mk index bf0785116d..53f86cb9d4 100644 --- a/testsuite/mk/test.mk +++ b/testsuite/mk/test.mk @@ -99,7 +99,7 @@ else RUNTEST_OPTS += -e "config.leading_underscore=False" endif -GHC_PRIM_LIBDIR := $(subst library-dirs: ,,$(shell "$(GHC_PKG)" field ghc-prim library-dirs --simple-output)) +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) diff --git a/testsuite/tests/driver/recompChangedPackage/Makefile b/testsuite/tests/driver/recompChangedPackage/Makefile index ecbf49ec03..413710290b 100644 --- a/testsuite/tests/driver/recompChangedPackage/Makefile +++ b/testsuite/tests/driver/recompChangedPackage/Makefile @@ -22,8 +22,8 @@ recompChangedPackage: # Now add PLib to q.. Main should be recompiled - $(GHC_PKG) --package-db tmp.d list - $(GHC_PKG) --package-db tmp.d unregister q-0.1.0.0 + '$(GHC_PKG)' --package-db tmp.d list + '$(GHC_PKG)' --package-db tmp.d unregister q-0.1.0.0 rm PLib.hs (cd q; cp q.cabal2 q.cabal) diff --git a/testsuite/tests/haddock/haddock_testsuite/Makefile b/testsuite/tests/haddock/haddock_testsuite/Makefile index 241371f71b..e7b234c2da 100644 --- a/testsuite/tests/haddock/haddock_testsuite/Makefile +++ b/testsuite/tests/haddock/haddock_testsuite/Makefile @@ -26,7 +26,7 @@ htmlTest: ./html-test \ $(ACCEPT) \ --ghc-path='$(TEST_HC)' \ - --haddock-path=$(HADDOCK) \ + --haddock-path='$(HADDOCK)' \ --haddock-stdout=haddock-out.log # Corresponds to the `latex-test` testsuite @@ -42,7 +42,7 @@ latexTest: ./latex-test \ $(ACCEPT) \ --ghc-path='$(TEST_HC)' \ - --haddock-path=$(HADDOCK) \ + --haddock-path='$(HADDOCK)' \ --haddock-stdout=haddock-out.log # Corresponds to the `hoogle-test` testsuite @@ -58,7 +58,7 @@ hoogleTest: ./hoogle-test \ $(ACCEPT) \ --ghc-path='$(TEST_HC)' \ - --haddock-path=$(HADDOCK) \ + --haddock-path='$(HADDOCK)' \ --haddock-stdout=haddock-out.log # Corresponds to the `hypsrc-test` testsuite @@ -74,5 +74,5 @@ hypsrcTest: ./hypsrc-test \ $(ACCEPT) \ --ghc-path='$(TEST_HC)' \ - --haddock-path=$(HADDOCK) \ + --haddock-path='$(HADDOCK)' \ --haddock-stdout=haddock-out.log |