Skip to content

Commit dbc5495

Browse files
ylecornecylecornec
committed
Update expected values for //tests:test-haddock
Folder names for packages now have an additional suffix which can be a hash, or `-inplace` See https://gitlab.haskell.org/ghc/ghc/-/issues/23788
1 parent 0010da0 commit dbc5495

File tree

2 files changed

+114
-43
lines changed

2 files changed

+114
-43
lines changed

‎rules_haskell_tests/tests/BUILD.bazel

Lines changed: 2 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ load("@rules_haskell//tests:inline_tests.bzl", "sh_inline_test")
22
load("@bazel_tools//tools/build_rules:test_rules.bzl", "rule_test")
33
load("@os_info//:os_info.bzl", "is_windows")
44
load("//tests:rule_test_exe.bzl", "rule_test_exe")
5+
load("//tests:test_haddock.bzl", "expected_values")
56
load(
67
"@rules_haskell//haskell:c2hs.bzl",
78
"c2hs_toolchain",
@@ -206,49 +207,7 @@ rule_test_exe(
206207
rule_test(
207208
name = "test-haddock",
208209
size = "small",
209-
generates = [
210-
"haddock/ghc-boot-th-{}".format(TEST_GHC_VERSION),
211-
] + {
212-
"9.2.8": [
213-
"haddock/array-0.5.4.0",
214-
"haddock/base-4.16.4.0",
215-
"haddock/deepseq-1.4.6.1",
216-
"haddock/ghc-bignum-1.2",
217-
"haddock/ghc-prim-0.8.0",
218-
"haddock/index",
219-
"haddock/pretty-1.1.3.6",
220-
"haddock/template-haskell-2.18.0.0",
221-
"haddock/testsZShaddockZShaddock-lib-a",
222-
"haddock/testsZShaddockZShaddock-lib-b",
223-
"haddock/testsZShaddockZShaddock-lib-deep",
224-
],
225-
"9.4.6": [
226-
"haddock/array-0.5.4.0",
227-
"haddock/base-4.17.2.0",
228-
"haddock/deepseq-1.4.8.0",
229-
"haddock/ghc-bignum-1.3",
230-
"haddock/ghc-prim-0.9.1",
231-
"haddock/index",
232-
"haddock/pretty-1.1.3.6",
233-
"haddock/template-haskell-2.19.0.0",
234-
"haddock/testsZShaddockZShaddock-lib-a",
235-
"haddock/testsZShaddockZShaddock-lib-b",
236-
"haddock/testsZShaddockZShaddock-lib-deep",
237-
],
238-
"9.6.2": [
239-
"haddock/array-0.5.5.0",
240-
"haddock/base-4.18.0.0",
241-
"haddock/deepseq-1.4.8.1",
242-
"haddock/ghc-bignum-1.3",
243-
"haddock/ghc-prim-0.10.0",
244-
"haddock/index",
245-
"haddock/pretty-1.1.3.6",
246-
"haddock/template-haskell-2.20.0.0",
247-
"haddock/testsZShaddockZShaddock-lib-a",
248-
"haddock/testsZShaddockZShaddock-lib-b",
249-
"haddock/testsZShaddockZShaddock-lib-deep",
250-
],
251-
}[TEST_GHC_VERSION],
210+
generates = expected_values(TEST_GHC_VERSION),
252211
rule = "//tests/haddock",
253212
)
254213

‎rules_haskell_tests/tests/test_haddock.bzl

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
""" Compute expected results for the //tests:test-haddock test"""
2+
3+
load("@os_info//:os_info.bzl", "cpu_value", "is_darwin", "is_linux", "is_nix_shell", "is_windows")
4+
5+
def expected_values(test_ghc_version):
6+
if test_ghc_version == "9.2.8":
7+
return [
8+
"haddock/array-0.5.4.0",
9+
"haddock/base-4.16.4.0",
10+
"haddock/deepseq-1.4.6.1",
11+
"haddock/ghc-bignum-1.2",
12+
"haddock/ghc-prim-0.8.0",
13+
"haddock/index",
14+
"haddock/pretty-1.1.3.6",
15+
"haddock/template-haskell-2.18.0.0",
16+
"haddock/testsZShaddockZShaddock-lib-a",
17+
"haddock/testsZShaddockZShaddock-lib-b",
18+
"haddock/testsZShaddockZShaddock-lib-deep",
19+
"haddock/ghc-boot-th-9.2.8",
20+
]
21+
elif test_ghc_version == "9.4.6":
22+
return [
23+
"haddock/array-0.5.4.0",
24+
"haddock/base-4.17.2.0",
25+
"haddock/deepseq-1.4.8.0",
26+
"haddock/ghc-bignum-1.3",
27+
"haddock/ghc-prim-0.9.1",
28+
"haddock/index",
29+
"haddock/pretty-1.1.3.6",
30+
"haddock/template-haskell-2.19.0.0",
31+
"haddock/testsZShaddockZShaddock-lib-a",
32+
"haddock/testsZShaddockZShaddock-lib-b",
33+
"haddock/testsZShaddockZShaddock-lib-deep",
34+
"haddock/ghc-boot-th-9.4.6",
35+
]
36+
elif test_ghc_version == "9.6.2":
37+
return [
38+
"haddock/array-0.5.5.0",
39+
"haddock/base-4.18.0.0",
40+
"haddock/deepseq-1.4.8.1",
41+
"haddock/ghc-bignum-1.3",
42+
"haddock/ghc-prim-0.10.0",
43+
"haddock/index",
44+
"haddock/pretty-1.1.3.6",
45+
"haddock/template-haskell-2.20.0.0",
46+
"haddock/testsZShaddockZShaddock-lib-a",
47+
"haddock/testsZShaddockZShaddock-lib-b",
48+
"haddock/testsZShaddockZShaddock-lib-deep",
49+
"haddock/ghc-boot-th-9.6.2",
50+
]
51+
elif test_ghc_version == "9.8.1" and is_nix_shell:
52+
return [
53+
"haddock/array-0.5.6.0-inplace",
54+
"haddock/base-4.19.0.0-inplace",
55+
"haddock/deepseq-1.5.0.0-inplace",
56+
"haddock/ghc-bignum-1.3-inplace",
57+
"haddock/ghc-prim-0.11.0-inplace",
58+
"haddock/index",
59+
"haddock/pretty-1.1.3.6-inplace",
60+
"haddock/template-haskell-2.21.0.0-inplace",
61+
"haddock/testsZShaddockZShaddock-lib-a",
62+
"haddock/testsZShaddockZShaddock-lib-b",
63+
"haddock/testsZShaddockZShaddock-lib-deep",
64+
"haddock/ghc-boot-th-9.8.1-inplace",
65+
]
66+
elif test_ghc_version == "9.8.1" and is_windows:
67+
return [
68+
"haddock/array-0.5.6.0-eeeb",
69+
"haddock/base-4.19.0.0-1e7d",
70+
"haddock/deepseq-1.5.0.0-940f",
71+
"haddock/ghc-bignum-1.3-7ca5",
72+
"haddock/ghc-boot-th-9.8.1-d8a4",
73+
"haddock/ghc-prim-0.11.0-6ef2",
74+
"haddock/index",
75+
"haddock/pretty-1.1.3.6-39a4",
76+
"haddock/template-haskell-2.21.0.0-9348",
77+
"haddock/testsZShaddockZShaddock-lib-a",
78+
"haddock/testsZShaddockZShaddock-lib-b",
79+
"haddock/testsZShaddockZShaddock-lib-deep",
80+
]
81+
elif test_ghc_version == "9.8.1" and is_linux:
82+
return [
83+
"haddock/array-0.5.6.0-88aa",
84+
"haddock/base-4.19.0.0-48cd",
85+
"haddock/deepseq-1.5.0.0-8148",
86+
"haddock/ghc-bignum-1.3-3882",
87+
"haddock/ghc-boot-th-9.8.1-bc0e",
88+
"haddock/ghc-prim-0.11.0-6b66",
89+
"haddock/index",
90+
"haddock/pretty-1.1.3.6-b1b6",
91+
"haddock/template-haskell-2.21.0.0-c6f4",
92+
"haddock/testsZShaddockZShaddock-lib-a",
93+
"haddock/testsZShaddockZShaddock-lib-b",
94+
"haddock/testsZShaddockZShaddock-lib-deep",
95+
]
96+
elif test_ghc_version == "9.8.1" and is_darwin:
97+
return [
98+
"haddock/array-0.5.6.0-256c",
99+
"haddock/base-4.19.0.0-d6d2",
100+
"haddock/deepseq-1.5.0.0-c140",
101+
"haddock/ghc-bignum-1.3-93be",
102+
"haddock/ghc-boot-th-9.8.1-5d14",
103+
"haddock/ghc-prim-0.11.0-5379",
104+
"haddock/index",
105+
"haddock/pretty-1.1.3.6-eec0",
106+
"haddock/template-haskell-2.21.0.0-be6e",
107+
"haddock/testsZShaddockZShaddock-lib-a",
108+
"haddock/testsZShaddockZShaddock-lib-b",
109+
"haddock/testsZShaddockZShaddock-lib-deep",
110+
]
111+
else:
112+
fail("//tests:test-haddock is missing case : (test_ghc_version={}, cpu_value={})".format(test_ghc_version, cpu_value))

0 commit comments

Comments
 (0)