diff options
| author | Krzysztof Gogolewski <krzysztof.gogolewski@tweag.io> | 2020-07-28 14:42:24 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-07-29 15:09:39 -0400 |
| commit | e1dc3d7b89ea79aea158ee487234d3730e857f04 (patch) | |
| tree | 6f56e90430a17e63d7ee519499b04de4886555a1 | |
| parent | 96c31ea1f0303ebabc59edccff2e88444fe02722 (diff) | |
| download | haskell-e1dc3d7b89ea79aea158ee487234d3730e857f04.tar.gz | |
Fix validation errors (#18510)
Test T2632 is a stage1 test that failed because of the Q => Quote change.
The remaining tests did not use quotation and failed when the path
contained a space.
| -rw-r--r-- | testsuite/tests/driver/T16318/Makefile | 2 | ||||
| -rw-r--r-- | testsuite/tests/driver/T18125/Makefile | 4 | ||||
| -rw-r--r-- | testsuite/tests/haddock/haddock_testsuite/Makefile | 8 | ||||
| -rw-r--r-- | testsuite/tests/hpc/Makefile | 6 | ||||
| -rw-r--r-- | testsuite/tests/stage1/T2632.hs | 2 |
5 files changed, 12 insertions, 10 deletions
diff --git a/testsuite/tests/driver/T16318/Makefile b/testsuite/tests/driver/T16318/Makefile index e3cf881247..40ff4f0854 100644 --- a/testsuite/tests/driver/T16318/Makefile +++ b/testsuite/tests/driver/T16318/Makefile @@ -5,7 +5,7 @@ include $(TOP)/mk/test.mk test_pe = test-package-environment T16318: - $(GHC_PKG) latest base > $(test_pe) + "$(GHC_PKG)" latest base > $(test_pe) "$(TEST_HC)" $(TEST_HC_OPTS) -v1 -package-env $(test_pe) -e "putStrLn \"Hello\"" > out 2>&1 C=`cat out | grep "Loaded package environment" -c` ; \ if [ $$C != "1" ]; then false; fi diff --git a/testsuite/tests/driver/T18125/Makefile b/testsuite/tests/driver/T18125/Makefile index 0a24d74610..d54e05a8ee 100644 --- a/testsuite/tests/driver/T18125/Makefile +++ b/testsuite/tests/driver/T18125/Makefile @@ -6,8 +6,8 @@ test_pe = test-package-environment test_lib = containers T18125: - $(GHC_PKG) latest base > $(test_pe) - $(GHC_PKG) latest $(test_lib) >> $(test_pe) + "$(GHC_PKG)" latest base > $(test_pe) + "$(GHC_PKG)" latest $(test_lib) >> $(test_pe) "$(TEST_HC)" $(TEST_HC_OPTS) -Wunused-packages -package-env $(test_pe) T18125.hs > out 2>&1 C=`cat out | grep "$(test_lib)" -c` ; \ if [ $$C != "1" ]; then false; fi diff --git a/testsuite/tests/haddock/haddock_testsuite/Makefile b/testsuite/tests/haddock/haddock_testsuite/Makefile index 4a86ee1a7a..241371f71b 100644 --- a/testsuite/tests/haddock/haddock_testsuite/Makefile +++ b/testsuite/tests/haddock/haddock_testsuite/Makefile @@ -25,7 +25,7 @@ htmlTest: $(TOP)/../utils/haddock/html-test/Main.hs ./html-test \ $(ACCEPT) \ - --ghc-path=$(TEST_HC) \ + --ghc-path='$(TEST_HC)' \ --haddock-path=$(HADDOCK) \ --haddock-stdout=haddock-out.log @@ -41,7 +41,7 @@ latexTest: $(TOP)/../utils/haddock/latex-test/Main.hs ./latex-test \ $(ACCEPT) \ - --ghc-path=$(TEST_HC) \ + --ghc-path='$(TEST_HC)' \ --haddock-path=$(HADDOCK) \ --haddock-stdout=haddock-out.log @@ -57,7 +57,7 @@ hoogleTest: $(TOP)/../utils/haddock/hoogle-test/Main.hs ./hoogle-test \ $(ACCEPT) \ - --ghc-path=$(TEST_HC) \ + --ghc-path='$(TEST_HC)' \ --haddock-path=$(HADDOCK) \ --haddock-stdout=haddock-out.log @@ -73,6 +73,6 @@ hypsrcTest: $(TOP)/../utils/haddock/hypsrc-test/Main.hs ./hypsrc-test \ $(ACCEPT) \ - --ghc-path=$(TEST_HC) \ + --ghc-path='$(TEST_HC)' \ --haddock-path=$(HADDOCK) \ --haddock-stdout=haddock-out.log diff --git a/testsuite/tests/hpc/Makefile b/testsuite/tests/hpc/Makefile index 5945bb8dd0..fdbbda14e0 100644 --- a/testsuite/tests/hpc/Makefile +++ b/testsuite/tests/hpc/Makefile @@ -11,7 +11,7 @@ T11798: T17073: LANG=ASCII "$(TEST_HC)" $(TEST_HC_ARGS) T17073.hs -fhpc -v0 ./T17073 - $(HPC) report T17073 - $(HPC) version - LANG=ASCII $(HPC) markup T17073 + "$(HPC)" report T17073 + "$(HPC)" version + LANG=ASCII "$(HPC)" markup T17073 diff --git a/testsuite/tests/stage1/T2632.hs b/testsuite/tests/stage1/T2632.hs index 64349c926d..b25f70cb96 100644 --- a/testsuite/tests/stage1/T2632.hs +++ b/testsuite/tests/stage1/T2632.hs @@ -7,8 +7,10 @@ import Language.Haskell.TH op :: Num v => v -> v -> v op a b = a + b +decl1 :: Q [Dec] decl1 = [d| func = 0 `op` 3 |] +decl2 :: Q [Dec] decl2 = [d| op x y = x func = 0 `op` 3 |] |