From 232635a59de2b816eeeb65d11d5ca98834d30a81 Mon Sep 17 00:00:00 2001
From: Zubin Duggal <zubin.duggal@gmail.com>
Date: Mon, 9 Aug 2021 19:05:45 +0530
Subject: [PATCH] Test bindist on 8.10 CI (#20211)
---
.gitlab/ci.sh | 1 +
.../tests/haddock/haddock_testsuite/Makefile | 16 ++++++++--------
testsuite/tests/hpc/Makefile | 6 +++---
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh
index 6add2b5ae434..ff9aeee64c0e 100755
--- a/.gitlab/ci.sh
+++ b/.gitlab/ci.sh
@@ -348,6 +348,7 @@ function push_perf_notes() {
function test_make() {
run "$MAKE" test_bindist TEST_PREP=YES
run "$MAKE" V=0 VERBOSE=1 test \
+ BINDIST=YES
THREADS="$cores" \
JUNIT_FILE=../../junit.xml
}
diff --git a/testsuite/tests/haddock/haddock_testsuite/Makefile b/testsuite/tests/haddock/haddock_testsuite/Makefile
index 4a86ee1a7a5f..e7b234c2da74 100644
--- a/testsuite/tests/haddock/haddock_testsuite/Makefile
+++ b/testsuite/tests/haddock/haddock_testsuite/Makefile
@@ -25,8 +25,8 @@ htmlTest:
$(TOP)/../utils/haddock/html-test/Main.hs
./html-test \
$(ACCEPT) \
- --ghc-path=$(TEST_HC) \
- --haddock-path=$(HADDOCK) \
+ --ghc-path='$(TEST_HC)' \
+ --haddock-path='$(HADDOCK)' \
--haddock-stdout=haddock-out.log
# Corresponds to the `latex-test` testsuite
@@ -41,8 +41,8 @@ latexTest:
$(TOP)/../utils/haddock/latex-test/Main.hs
./latex-test \
$(ACCEPT) \
- --ghc-path=$(TEST_HC) \
- --haddock-path=$(HADDOCK) \
+ --ghc-path='$(TEST_HC)' \
+ --haddock-path='$(HADDOCK)' \
--haddock-stdout=haddock-out.log
# Corresponds to the `hoogle-test` testsuite
@@ -57,8 +57,8 @@ hoogleTest:
$(TOP)/../utils/haddock/hoogle-test/Main.hs
./hoogle-test \
$(ACCEPT) \
- --ghc-path=$(TEST_HC) \
- --haddock-path=$(HADDOCK) \
+ --ghc-path='$(TEST_HC)' \
+ --haddock-path='$(HADDOCK)' \
--haddock-stdout=haddock-out.log
# Corresponds to the `hypsrc-test` testsuite
@@ -73,6 +73,6 @@ hypsrcTest:
$(TOP)/../utils/haddock/hypsrc-test/Main.hs
./hypsrc-test \
$(ACCEPT) \
- --ghc-path=$(TEST_HC) \
- --haddock-path=$(HADDOCK) \
+ --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 5945bb8dd0ee..fdbbda14e09a 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
--
GitLab