[Git][ghc/ghc][master] Fix validation errors (#18510)

[Marge Bot]

 Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
e1dc3d7b by Krzysztof Gogolewski at 2020-07-29T15:09:39-04:00
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.

- - - - -


5 changed files:

- testsuite/tests/driver/T16318/Makefile
- testsuite/tests/driver/T18125/Makefile
- testsuite/tests/haddock/haddock_testsuite/Makefile
- testsuite/tests/hpc/Makefile
- testsuite/tests/stage1/T2632.hs


Changes:

=====================================
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


=====================================
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


=====================================
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


=====================================
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
 


=====================================
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 |]
 



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e1dc3d7b89ea79aea158ee487234d3730e857f04

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e1dc3d7b89ea79aea158ee487234d3730e857f04
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20200729/150f4adc/attachment-0001.html>