Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update tests for CLC proposal: Modify displayed exception type #86

Merged
merged 1 commit into from
Aug 1, 2024

Conversation

tbidne
Copy link
Contributor

@tbidne tbidne commented Jul 4, 2024

Now that the CLC proposal has been approved, this can be merged.

haskell/core-libraries-committee#261.

See https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12242.

Obviates #81.

@tbidne
Copy link
Contributor Author

tbidne commented Jul 5, 2024

CI is currently failing due to a glibc mismatch:

2024-07-04T22:29:26.2172453Z Processing triggers for libc-bin (2.27-3ubuntu1.6) ...
...
2024-07-04T22:30:43.8257620Z /__e/node20/bin/node: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.28' not found (required by /__e/node20/bin/node)

2.27 (and 2.28, for that matter) are quite old, and so is the ubuntu runner 20.04 (ubuntu-latest is 22.04). Perhaps this should be updated?


Edit: Updating the runner (or checkout to v4) does not help, see: haskell-CI/haskell-ci#738.

@JackKelly-Bellroy
Copy link

Create cabal.haskell-ci and override the container distribution manually:

distribution: jammy

We had to do this with some of our packages, too:
https://github.com/bellroy/unliftio-servant-server/blob/c91cd898561c142fa382ccf2e045552d0dd27173/cabal.haskell-ci

@tbidne
Copy link
Contributor Author

tbidne commented Jul 14, 2024

Thanks! PR incoming.

@Bodigrim Bodigrim mentioned this pull request Jul 22, 2024
The following two proposals add exception type info to the output
of displayException:

haskell/core-libraries-committee#231
haskell/core-libraries-committee#261

This commit updates the test output here to match:

https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12242
@tbidne tbidne force-pushed the display-ex-type2 branch from 8570088 to e9e9aaa Compare July 23, 2024 21:12
@tbidne
Copy link
Contributor Author

tbidne commented Jul 23, 2024

@wz1000 now that CI is passing, might you be able to merge this one?

@Bodigrim
Copy link

@wz1000 @andreasabel does anyone of you feel comfortable to merge? The CLC proposal has been approved a month ago, so I don't think the change of baseline is controversial.

@andreasabel
Copy link
Member

Well, I could merge it, but I could not retrieve evidence of its correctness:

The affected test case stm055 is not contained in the cabal-runnable testsuite testsuite/.
Instead it is contained in the older tests/ suite that is not covered by CI.
Trying to run it manually I get the following output:

stm/tests[master]$ ./runtests.sh 
using GHC version: 9.10.1
== running test 'T15136'
Loaded package environment from /Users/abel/bin/src/stm/.ghc.environment.x86_64-darwin-9.10.1
[1 of 2] Compiling Main             ( T15136.hs, T15136.o )
[2 of 2] Linking T15136
validate stdout output...
--- T15136.stdout	2024-04-13 10:30:37.000000000 +0200
+++ T15136.stdout.run	2024-08-01 07:44:55.000000000 +0200
@@ -1 +0,0 @@
-1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 
\ No newline at end of file

To me it looks like one or more tests are in a broken state and I do not even get to see the result of test stm055.

@wz1000
Copy link

wz1000 commented Aug 1, 2024

If you update https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12242 to point to the same commit (e9e9aaa) and the GHC CI passes, I think we can merge this.

@tbidne
Copy link
Contributor Author

tbidne commented Aug 1, 2024

MR has been updated to the current commit here and CI passing.

@wz1000 wz1000 merged commit cb861ea into haskell:master Aug 1, 2024
12 checks passed
@tbidne tbidne deleted the display-ex-type2 branch August 1, 2024 13:07
@tbidne
Copy link
Contributor Author

tbidne commented Aug 1, 2024

Thanks @wz1000!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants