diff options
| author | Zubin Duggal <zubin.duggal@gmail.com> | 2021-08-09 19:05:45 +0530 |
|---|---|---|
| committer | Zubin Duggal <zubin.duggal@gmail.com> | 2021-08-11 12:38:56 +0530 |
| commit | 232635a59de2b816eeeb65d11d5ca98834d30a81 (patch) | |
| tree | 2b25c68d9f4f0fb2ba0bba5429a7e6a81b5578ef | |
| parent | 459017906306be4b0127fe423020771db75e8dd7 (diff) | |
| download | haskell-232635a59de2b816eeeb65d11d5ca98834d30a81.tar.gz | |
Test bindist on 8.10 CI (#20211)
| -rwxr-xr-x | .gitlab/ci.sh | 1 | ||||
| -rw-r--r-- | testsuite/tests/haddock/haddock_testsuite/Makefile | 16 | ||||
| -rw-r--r-- | testsuite/tests/hpc/Makefile | 6 |
3 files changed, 12 insertions, 11 deletions
diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh index 6add2b5ae4..ff9aeee64c 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 4a86ee1a7a..e7b234c2da 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 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 |