diff options
| author | Rémi Lefèvre <rlefevre@dmy.fr> | 2019-12-10 08:57:43 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-12-12 16:31:59 +0000 |
| commit | 42336c1358c0bc8186f48c20c6ae30f9ba63f1f3 (patch) | |
| tree | 54f21d71fca8bd5d9a05a2f03aec4642c93caa3f /community/ghc/0001-testsuite-Add-Alpine-Linux-x64-stat-too-good-allocat.patch | |
| parent | db28db84a99ef663f3d06025a645c6c0d72a873a (diff) | |
| download | aports-42336c1358c0bc8186f48c20c6ae30f9ba63f1f3.tar.bz2 aports-42336c1358c0bc8186f48c20c6ae30f9ba63f1f3.tar.xz | |
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.
Diffstat (limited to 'community/ghc/0001-testsuite-Add-Alpine-Linux-x64-stat-too-good-allocat.patch')
| -rw-r--r-- | community/ghc/0001-testsuite-Add-Alpine-Linux-x64-stat-too-good-allocat.patch | 76 |
1 files changed, 76 insertions, 0 deletions
diff --git a/community/ghc/0001-testsuite-Add-Alpine-Linux-x64-stat-too-good-allocat.patch b/community/ghc/0001-testsuite-Add-Alpine-Linux-x64-stat-too-good-allocat.patch new file mode 100644 index 0000000000..3ec3dd9c6b --- /dev/null +++ b/community/ghc/0001-testsuite-Add-Alpine-Linux-x64-stat-too-good-allocat.patch @@ -0,0 +1,76 @@ +From 507ceb34bce4bd5cb171987e7447c470195e210b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Lef=C3=A8vre?= <rlefevre@dmy.fr> +Date: Tue, 10 Dec 2019 00:35:29 +0100 +Subject: testsuite: Add Alpine Linux x64 'stat too good' allocation results + +--- + testsuite/tests/perf/compiler/all.T | 4 ++++ + testsuite/tests/perf/haddock/all.T | 8 +++++++- + testsuite/tests/perf/should_run/all.T | 3 +++ + 3 files changed, 14 insertions(+), 1 deletion(-) + +diff --git a/testsuite/tests/perf/compiler/all.T b/testsuite/tests/perf/compiler/all.T +index dfb8613d98..1b5e065a55 100644 +--- a/testsuite/tests/perf/compiler/all.T ++++ b/testsuite/tests/perf/compiler/all.T +@@ -449,6 +449,8 @@ test('T5631', + # 2014-04-04: 346389856 (x86 Windows, 64 bit machine) + # 2014-12-01: 390199244 (Windows laptop) + # 2016-04-06: 570137436 (amd64/Linux) many reasons ++ (platform('x86_64-alpine-linux'), 1096228616, 5), ++ # 2019-12-98: 1096228616 + (wordsize(64), 1161885448, 5)]), + # expected value: 774595008 (amd64/Linux): + # expected value: 735486328 (amd64/Linux) 2012/12/12: +@@ -477,6 +479,8 @@ test('parsing001', + [(wordsize(32), 232777056, 10), + # Initial: 274000576 + # 2017-03-24: 232777056 ++ (platform('x86_64-alpine-linux'), 426826936, 5), ++ # 2019-12-09: 426826936 + (wordsize(64), 519401296, 5)]), + # expected value: 587079016 (amd64/Linux) + # 2016-09-01: 581551384 (amd64/Linux) Restore w/w limit (#11565) +diff --git a/testsuite/tests/perf/haddock/all.T b/testsuite/tests/perf/haddock/all.T +index 1ad98c72ca..237f581d2f 100644 +--- a/testsuite/tests/perf/haddock/all.T ++++ b/testsuite/tests/perf/haddock/all.T +@@ -10,6 +10,9 @@ test('haddock.base', + # 2017-02-19 24286343184 (x64/Windows) - Generalize kind of (->) + # 2017-12-24 18733710728 (x64/Windows) - Unknown + ++ ,(platform('x86_64-alpine-linux'), 23238935336, 5) ++ # 2019-12-09 23238935336 ++ + ,(wordsize(64), 26201242752, 5) + # 2012-08-14: 5920822352 (amd64/Linux) + # 2012-09-20: 5829972376 (amd64/Linux) +@@ -79,7 +82,10 @@ test('haddock.Cabal', + [extra_files(['../../../../libraries/Cabal/Cabal/dist-install/haddock.t']), + unless(in_tree_compiler(), skip), req_haddock + ,stats_num_field('bytes allocated', +- [(wordsize(64), 27520214496, 5) ++ [(platform('x86_64-alpine-linux'), 25761205904, 5) ++ # 2019-12-09 25761205904 ++ ++ ,(wordsize(64), 27520214496, 5) + # 2012-08-14: 3255435248 (amd64/Linux) + # 2012-08-29: 3324606664 (amd64/Linux, new codegen) + # 2012-10-08: 3373401360 (amd64/Linux) +diff --git a/testsuite/tests/perf/should_run/all.T b/testsuite/tests/perf/should_run/all.T +index fb8137647c..b09e907730 100644 +--- a/testsuite/tests/perf/should_run/all.T ++++ b/testsuite/tests/perf/should_run/all.T +@@ -465,6 +465,9 @@ test('T9203', + # 2016-04-06 84345136 (i386/Debian) not sure + # 2017-03-24 77969268 (x86/Linux, 64-bit machine) probably join points + ++ , (platform('x86_64-alpine-linux'), 46371880, 5) ++ # 2019-12-08 46371880 ++ + , (wordsize(64), 98360576, 5) ]), + # was 95747304 + # 2019-09-10 94547280 post-AMP cleanup +-- +2.17.1 + |