| ... |
... |
@@ -33,7 +33,12 @@ test('T11223_simple_duplicate', |
|
33
|
33
|
|
|
34
|
34
|
test('T11223_simple_duplicate_lib',
|
|
35
|
35
|
[extra_files(['bar.c', 'foo.c', 'foo.hs']),
|
|
36
|
|
- when(ghc_dynamic(), skip), normalise_errmsg_fun(normalise_duplicate_errmsg),
|
|
|
36
|
+ when(ghc_dynamic(), skip),
|
|
|
37
|
+ # Darwin/Mach-O reports external C symbols with a leading underscore (e.g. _a, _c)
|
|
|
38
|
+ # which our expected stderr (shared with ELF platforms) does not account for.
|
|
|
39
|
+ # Rather than broaden normalisation here, skip on darwin for now.
|
|
|
40
|
+ when(opsys('darwin'), skip),
|
|
|
41
|
+ normalise_errmsg_fun(normalise_duplicate_errmsg),
|
|
37
|
42
|
req_c],
|
|
38
|
43
|
makefile_test, ['t_11223_simple_duplicate_lib'])
|
|
39
|
44
|
|
| ... |
... |
@@ -57,7 +62,10 @@ test('T11223_link_order_b_a_succeed', |
|
57
|
62
|
|
|
58
|
63
|
test('T11223_link_order_a_b_2_fail',
|
|
59
|
64
|
[extra_files(['bar.c', 'foo.c', 'foo3.hs']),
|
|
60
|
|
- when(ghc_dynamic(), skip), normalise_errmsg_fun(normalise_duplicate_errmsg),
|
|
|
65
|
+ when(ghc_dynamic(), skip),
|
|
|
66
|
+ # See note above about Mach-O leading underscores; skip on darwin.
|
|
|
67
|
+ when(opsys('darwin'), skip),
|
|
|
68
|
+ normalise_errmsg_fun(normalise_duplicate_errmsg),
|
|
61
|
69
|
req_c],
|
|
62
|
70
|
makefile_test, ['t_11223_link_order_a_b_2_fail'])
|
|
63
|
71
|
|