From 42336c1358c0bc8186f48c20c6ae30f9ba63f1f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Lef=C3=A8vre?= Date: Tue, 10 Dec 2019 08:57:43 +0000 Subject: community/ghc: fix testsuite on Alpine Linux - Add `MAKEFLAGS= ` hack to work around failing `+PYTHON` - Add "stat too good" results for Alpine x64 - Increase tolerancy for two "stat not good enough" tests - Add a few more patches from mainline - Require gnu grep to fix T13340 & T7014 - Skip T2615 and T10458 (unresolved linking issues) Some tests should be investigated, particularly - T9630 (+22% memory allocation) - T10458: linking issue - T2615: linker script issue - T12600: broken pipe with grep .. | head -n 1 (replaced by grep -m 1) Hopefully we can get rid of the MAKEFLAGS hack once Hadrian is used. --- ...suite-unset-MAKEFLAGS-when-calling-python.patch | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 community/ghc/0001-testsuite-unset-MAKEFLAGS-when-calling-python.patch (limited to 'community/ghc/0001-testsuite-unset-MAKEFLAGS-when-calling-python.patch') diff --git a/community/ghc/0001-testsuite-unset-MAKEFLAGS-when-calling-python.patch b/community/ghc/0001-testsuite-unset-MAKEFLAGS-when-calling-python.patch new file mode 100644 index 0000000000..f49f252125 --- /dev/null +++ b/community/ghc/0001-testsuite-unset-MAKEFLAGS-when-calling-python.patch @@ -0,0 +1,26 @@ +From ee0f12d6b0f58865353fbef51b212390bcd2be91 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Lef=C3=A8vre?= +Date: Tue, 10 Dec 2019 00:54:38 +0100 +Subject: testsuite: unset MAKEFLAGS when calling python + +This is not recommended but +PYTHON does not seem to work on Alpine. +--- + testsuite/mk/test.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/testsuite/mk/test.mk b/testsuite/mk/test.mk +index 87d22b330b..5fe9adb70d 100644 +--- a/testsuite/mk/test.mk ++++ b/testsuite/mk/test.mk +@@ -326,7 +326,7 @@ $(TIMEOUT_PROGRAM) : + # communicate with the topmake. + # See Note [Communicating options and variables to a submake] + test: $(TIMEOUT_PROGRAM) +- +PYTHON="$(PYTHON)" "$(PYTHON)" $(RUNTESTS) $(RUNTEST_OPTS) \ ++ MAKEFLAGS= PYTHON="$(PYTHON)" "$(PYTHON)" $(RUNTESTS) $(RUNTEST_OPTS) \ + $(patsubst %, --only=%, $(TEST)) \ + $(patsubst %, --only=%, $(TESTS)) \ + $(patsubst %, --way=%, $(WAY)) \ +-- +2.17.1 + -- cgit v1.2.3