[Git][ghc/ghc][master] 2 commits: JS: testsuite: use correct ticket numbers
Marge Bot (@marge-bot)
gitlab at gitlab.haskell.org
Sun Jun 18 06:50:50 UTC 2023
Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC
Commits:
9132d529 by Sylvain Henry at 2023-06-18T02:50:34-04:00
JS: testsuite: use correct ticket numbers
- - - - -
c3a1274c by Sylvain Henry at 2023-06-18T02:50:34-04:00
JS: don't dump eventlog to stderr by default
Fix T16707
Bump stm submodule
- - - - -
6 changed files:
- libraries/stm
- rts/js/environment.js
- + rts/js/eventlog.js
- rts/rts.cabal.in
- testsuite/tests/cabal/t22333/all.T
- testsuite/tests/safeHaskell/check/pkg01/all.T
Changes:
=====================================
libraries/stm
=====================================
@@ -1 +1 @@
-Subproject commit cfb7e775c5f6df281b7052b7b4e4a51dafda10d2
+Subproject commit 86172e75bd4f5c400b3a6f0cd3945bdb7c03bcdd
=====================================
rts/js/environment.js
=====================================
@@ -411,14 +411,6 @@ function h$gettimeofday(tv_v,tv_o,tz_v,tz_o) {
return 0;
}
-function h$traceEvent(ev_v,ev_o) {
- h$errorMsg(h$decodeUtf8z(ev_v, ev_o));
-}
-
-function h$traceMarker(ev_v,ev_o) {
- h$errorMsg(h$decodeUtf8z(ev_v, ev_o));
-}
-
var h$__hscore_gettimeofday = h$gettimeofday;
var h$myTimeZone = h$encodeUtf8("UTC");
=====================================
rts/js/eventlog.js
=====================================
@@ -0,0 +1,18 @@
+// default eventlog writer: does nothing
+var h$event_log_writer = (a,o) => {return;}
+
+// redirect the eventlog to stderr
+function h$eventlogToStderr() {
+ h$event_log_writer = (a,o) => h$errorMsg(h$decodeUtf8z(a,o));
+}
+
+function h$traceEvent(ev_v,ev_o) {
+ h$event_log_writer(ev_v,ev_o);
+}
+
+function h$traceMarker(ev_v,ev_o) {
+ h$event_log_writer(ev_v,ev_o);
+}
+
+function h$flushEventlog(cap_a,cap_o) {
+}
=====================================
rts/rts.cabal.in
=====================================
@@ -94,6 +94,7 @@ library
js/debug.js
js/enum.js
js/environment.js
+ js/eventlog.js
js/gc.js
js/goog.js
js/hscore.js
=====================================
testsuite/tests/cabal/t22333/all.T
=====================================
@@ -1,4 +1,4 @@
test('T22333',
- [extra_files(['Setup.hs', 'my-exe', 'my-package-a', 'my-package-b' ]), js_broken(22573)],
+ [extra_files(['Setup.hs', 'my-exe', 'my-package-a', 'my-package-b' ]), js_broken(22349)],
makefile_test,
[])
=====================================
testsuite/tests/safeHaskell/check/pkg01/all.T
=====================================
@@ -53,7 +53,7 @@ test('ImpSafe03',
test('ImpSafe04', normalise_version('base'), compile_fail, ['-fpackage-trust -distrust base'])
test('ImpSafeOnly01',
- [js_broken(22350),
+ [js_broken(22349),
req_host_target_ghc,
extra_files(['M_SafePkg.hs', 'M_SafePkg2.hs', 'M_SafePkg3.hs', 'M_SafePkg4.hs', 'M_SafePkg5.hs', 'M_SafePkg6.hs', 'M_SafePkg7.hs', 'M_SafePkg8.hs', 'Setup.hs', 'p.cabal']),
pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly01 ' + make_args)],
@@ -61,7 +61,7 @@ test('ImpSafeOnly01',
['-fpackage-trust -package-db pdb.ImpSafeOnly01/local.db -trust base'])
test('ImpSafeOnly02',
- [js_broken(22350),
+ [js_broken(22349),
req_host_target_ghc,
extra_files(['M_SafePkg.hs', 'M_SafePkg2.hs', 'M_SafePkg3.hs', 'M_SafePkg4.hs', 'M_SafePkg5.hs', 'M_SafePkg6.hs', 'M_SafePkg7.hs', 'M_SafePkg8.hs', 'Setup.hs', 'p.cabal']),
pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly02 ' + make_args)],
@@ -70,7 +70,7 @@ test('ImpSafeOnly02',
# Fail since we enable package trust (and still need safePkg01 trusted)
test('ImpSafeOnly03',
- [js_broken(22350),
+ [js_broken(22349),
req_host_target_ghc,
extra_files(['M_SafePkg.hs', 'M_SafePkg2.hs', 'M_SafePkg3.hs', 'M_SafePkg4.hs', 'M_SafePkg5.hs', 'M_SafePkg6.hs', 'M_SafePkg7.hs', 'M_SafePkg8.hs', 'Setup.hs', 'p.cabal']),
pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly03 ' + make_args)],
@@ -79,7 +79,7 @@ test('ImpSafeOnly03',
# Succeed since we don't enable package trust
test('ImpSafeOnly04',
- [js_broken(22350),
+ [js_broken(22349),
req_host_target_ghc,
extra_files(['M_SafePkg.hs', 'M_SafePkg2.hs', 'M_SafePkg3.hs', 'M_SafePkg4.hs', 'M_SafePkg5.hs', 'M_SafePkg6.hs', 'M_SafePkg7.hs', 'M_SafePkg8.hs', 'Setup.hs', 'p.cabal']),
pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly04 ' + make_args)],
@@ -87,14 +87,14 @@ test('ImpSafeOnly04',
# fail due to missing trust of safePkg01, next test succeeds.
test('ImpSafeOnly05',
- [js_broken(22350),
+ [js_broken(22349),
req_host_target_ghc,
extra_files(['M_SafePkg.hs', 'M_SafePkg2.hs', 'M_SafePkg3.hs', 'M_SafePkg4.hs', 'M_SafePkg5.hs', 'M_SafePkg6.hs', 'M_SafePkg7.hs', 'M_SafePkg8.hs', 'Setup.hs', 'p.cabal']),
pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly05 ' + make_args)],
compile_fail,
['-fpackage-trust -package-db pdb.ImpSafeOnly05/local.db -trust base'])
test('ImpSafeOnly06',
- [js_broken(22350),
+ [js_broken(22349),
req_host_target_ghc,
extra_files(['M_SafePkg.hs', 'M_SafePkg2.hs', 'M_SafePkg3.hs', 'M_SafePkg4.hs', 'M_SafePkg5.hs', 'M_SafePkg6.hs', 'M_SafePkg7.hs', 'M_SafePkg8.hs', 'Setup.hs', 'p.cabal']),
pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly06 ' + make_args)],
@@ -103,7 +103,7 @@ test('ImpSafeOnly06',
# fail due to missing trust
test('ImpSafeOnly07',
- [js_broken(22350),
+ [js_broken(22349),
req_host_target_ghc,
extra_files(['M_SafePkg.hs', 'M_SafePkg2.hs', 'M_SafePkg3.hs', 'M_SafePkg4.hs', 'M_SafePkg5.hs', 'M_SafePkg6.hs', 'M_SafePkg7.hs', 'M_SafePkg8.hs', 'Setup.hs', 'p.cabal']),
pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly07 ' + make_args),
@@ -111,7 +111,7 @@ test('ImpSafeOnly07',
compile_fail,
['-fpackage-trust -package-db pdb.ImpSafeOnly07/local.db -trust safePkg01 -distrust bytestring'])
test('ImpSafeOnly08',
- [js_broken(22350),
+ [js_broken(22349),
req_host_target_ghc,
extra_files(['M_SafePkg.hs', 'M_SafePkg2.hs', 'M_SafePkg3.hs', 'M_SafePkg4.hs', 'M_SafePkg5.hs', 'M_SafePkg6.hs', 'M_SafePkg7.hs', 'M_SafePkg8.hs', 'Setup.hs', 'p.cabal']),
pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly08 ' + make_args),
@@ -119,7 +119,7 @@ test('ImpSafeOnly08',
compile_fail,
['-fpackage-trust -package-db pdb.ImpSafeOnly08/local.db -trust safePkg01'])
test('ImpSafeOnly09',
- [js_broken(22350),
+ [js_broken(22349),
req_host_target_ghc,
extra_files(['M_SafePkg.hs', 'M_SafePkg2.hs', 'M_SafePkg3.hs', 'M_SafePkg4.hs', 'M_SafePkg5.hs', 'M_SafePkg6.hs', 'M_SafePkg7.hs', 'M_SafePkg8.hs', 'Setup.hs', 'p.cabal']),
pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly09 ' + make_args),
@@ -129,7 +129,7 @@ test('ImpSafeOnly09',
# finally succeed
test('ImpSafeOnly10',
- [js_broken(22350),
+ [js_broken(22349),
req_host_target_ghc,
extra_files(['M_SafePkg.hs', 'M_SafePkg2.hs', 'M_SafePkg3.hs', 'M_SafePkg4.hs', 'M_SafePkg5.hs', 'M_SafePkg6.hs', 'M_SafePkg7.hs', 'M_SafePkg8.hs', 'Setup.hs', 'p.cabal']),
pre_cmd('$MAKE -s --no-print-directory mkPackageDatabase.ImpSafeOnly10 ' + make_args)],
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/800aad7ea83e6b56798a953511acbd336af3f253...c3a1274c451795bc126234aedf02fbc21f8c4a79
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/800aad7ea83e6b56798a953511acbd336af3f253...c3a1274c451795bc126234aedf02fbc21f8c4a79
You're receiving this email because of your account on gitlab.haskell.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20230618/d2334425/attachment-0001.html>
More information about the ghc-commits
mailing list