[Git][ghc/ghc][wip/js-staging] 3 commits: Disable more tests
Sylvain Henry (@hsyl20)
gitlab at gitlab.haskell.org
Thu Oct 6 09:17:05 UTC 2022
Sylvain Henry pushed to branch wip/js-staging at Glasgow Haskell Compiler / GHC
Commits:
211331f9 by Sylvain Henry at 2022-10-06T11:16:36+02:00
Disable more tests
- - - - -
3a983d3a by Sylvain Henry at 2022-10-06T11:16:36+02:00
Disable T1791
- - - - -
71e12d28 by Sylvain Henry at 2022-10-06T11:18:32+02:00
Raise NonTermination as an async exception
- - - - -
24 changed files:
- rts/js/thread.js
- testsuite/tests/driver/T20604/all.T
- testsuite/tests/driver/multipleHomeUnits/all.T
- testsuite/tests/driver/multipleHomeUnits/th-deps/all.T
- testsuite/tests/driver/recompTH/all.T
- testsuite/tests/driver/th-new-test/all.T
- testsuite/tests/ffi/should_compile/all.T
- testsuite/tests/indexed-types/should_fail/all.T
- testsuite/tests/linear/should_compile/all.T
- testsuite/tests/overloadedrecflds/should_compile/all.T
- testsuite/tests/overloadedrecflds/should_fail/all.T
- testsuite/tests/overloadedrecflds/should_run/all.T
- testsuite/tests/parser/should_compile/all.T
- testsuite/tests/parser/unicode/all.T
- testsuite/tests/patsyn/should_run/all.T
- testsuite/tests/polykinds/all.T
- testsuite/tests/qualifieddo/should_run/all.T
- testsuite/tests/quotes/TH_spliceViewPat/test.T
- testsuite/tests/quotes/all.T
- testsuite/tests/rename/should_compile/all.T
- testsuite/tests/rename/should_fail/all.T
- testsuite/tests/rep-poly/all.T
- testsuite/tests/rts/T1791/all.T
- testsuite/tests/rts/all.T
Changes:
=====================================
rts/js/thread.js
=====================================
@@ -1358,7 +1358,7 @@ function h$blockOnBlackhole(c) {
TRACE_SCHEDULER("blackhole, blocking: " + h$collectProps(c));
if(BLACKHOLE_TID(c) === h$currentThread) {
TRACE_SCHEDULER("NonTermination");
- return h$throw(h$baseZCControlziExceptionziBasezinonTermination, false); // is this an async exception?
+ return h$throw(h$baseZCControlziExceptionziBasezinonTermination, true);
}
TRACE_SCHEDULER("blackhole, blocking thread: " + h$threadString(h$currentThread));
if(BLACKHOLE_QUEUE(c) === null) {
=====================================
testsuite/tests/driver/T20604/all.T
=====================================
@@ -9,5 +9,6 @@ def normalise_paths(s):
return '\n'.join(res)
-test('T20604', [extra_files(['A.hs', 'A1.hs'])
+test('T20604', [ req_th
+ , extra_files(['A.hs', 'A1.hs'])
, normalise_fun(normalise_paths)], makefile_test, [])
=====================================
testsuite/tests/driver/multipleHomeUnits/all.T
=====================================
@@ -2,7 +2,7 @@ test('multipleHomeUnits_single1', [extra_files([ 'a/', 'unitA'])], multiunit_com
test('multipleHomeUnits_single2', [extra_files([ 'b/', 'unitB'])], multiunit_compile, [['unitB'], '-fhide-source-paths'])
test('multipleHomeUnits_single3', [extra_files([ 'c/', 'unitC'])], multiunit_compile, [['unitC'], '-fhide-source-paths'])
test('multipleHomeUnits_single4', [extra_files([ 'd/', 'unitD'])], multiunit_compile, [['unitD'], '-fhide-source-paths'])
-test('multipleHomeUnits_single5', [extra_files([ 'th/', 'unitTH'])], multiunit_compile, [['unitTH'], '-fhide-source-paths'])
+test('multipleHomeUnits_single5', [req_th,extra_files([ 'th/', 'unitTH'])], multiunit_compile, [['unitTH'], '-fhide-source-paths'])
test('multipleHomeUnits_cpp', [extra_files([ 'cpp-includes/', 'unitCPPIncludes'])], multiunit_compile, [['unitCPPIncludes'], '-fhide-source-paths'])
test('multipleHomeUnits_cfile', [extra_files([ 'c-file/', 'unitCFile'])], multiunit_compile, [['unitCFile'], '-fhide-source-paths'])
test('multipleHomeUnits_callstack', [extra_files([ 'callstack/', 'unitCallstack'])], makefile_test, [])
=====================================
testsuite/tests/driver/multipleHomeUnits/th-deps/all.T
=====================================
@@ -1 +1 @@
-test('multipleHomeUnits_th-deps', [extra_files([ 'p1/', 'p2', 'q', 'unitP1', 'unitP2', 'unitQ'])], multiunit_compile, [['unitP1', 'unitP2', 'unitQ'], '-fhide-source-paths'])
+test('multipleHomeUnits_th-deps', [req_th,extra_files([ 'p1/', 'p2', 'q', 'unitP1', 'unitP2', 'unitQ'])], multiunit_compile, [['unitP1', 'unitP2', 'unitQ'], '-fhide-source-paths'])
=====================================
testsuite/tests/driver/recompTH/all.T
=====================================
@@ -1,4 +1,4 @@
-test('recompTH', [extra_files(['A.hs', 'B1.hs', 'B2.hs' ]),
+test('recompTH', [req_th, extra_files(['A.hs', 'B1.hs', 'B2.hs' ]),
when(fast(), skip)
, normalise_slashes],
makefile_test, [])
=====================================
testsuite/tests/driver/th-new-test/all.T
=====================================
@@ -1,4 +1,4 @@
-test('th-new-test', [extra_files(['A.hs', 'B.hs', 'C.hs', 'D.hs', 'B1.hs', 'D1.hs', 'Main.hs']),
+test('th-new-test', [req_th, extra_files(['A.hs', 'B.hs', 'C.hs', 'D.hs', 'B1.hs', 'D1.hs', 'Main.hs']),
when(fast(), skip)
, normalise_slashes],
makefile_test, [])
=====================================
testsuite/tests/ffi/should_compile/all.T
=====================================
@@ -36,7 +36,7 @@ test('T14125', normal, compile, [''])
test(
'cc017',
# We need TH but can't load profiled dynamic objects
- when(ghc_dynamic(), omit_ways(['profasm'])),
+ [req_th,when(ghc_dynamic(), omit_ways(['profasm']))],
compile,
[
'-optc=-DC -optcxx=-DCXX -optcxx=-std=c++11'
=====================================
testsuite/tests/indexed-types/should_fail/all.T
=====================================
@@ -111,7 +111,7 @@ test('T21092', normal, compile_fail, [''])
test('T9167', normal, compile_fail, [''])
test('T9171', normal, compile_fail, [''])
test('T9097', normal, compile_fail, [''])
-test('T9160', normal, compile_fail, [''])
+test('T9160', req_th, compile_fail, [''])
test('T9357', normal, compile_fail, [''])
test('T9371', normal, compile_fail, [''])
test('T9433', normal, compile_fail, [''])
=====================================
testsuite/tests/linear/should_compile/all.T
=====================================
@@ -33,7 +33,7 @@ test('LinearLetRec', expect_broken(18694), compile, ['-O -dlinear-core-lint'])
test('LinearTH1', normal, compile, [''])
test('LinearTH2', normal, compile, [''])
test('LinearTH3', normal, compile, [''])
-test('LinearTH4', normal, compile, [''])
+test('LinearTH4', req_th, compile, [''])
test('LinearHole', normal, compile, [''])
test('LinearDataConSections', normal, compile, [''])
test('T18731', normal, compile, [''])
=====================================
testsuite/tests/overloadedrecflds/should_compile/all.T
=====================================
@@ -3,7 +3,7 @@ test('T12609', normal, compile, [''])
test('T16597', [], multimod_compile, ['T16597', '-v0'])
test('T17176', normal, compile, [''])
test('DRFPatSynExport', [], makefile_test, ['DRFPatSynExport'])
-test('NoFieldSelectors', normal, compile, [''])
+test('NoFieldSelectors', req_interp, compile, [''])
test('NFSDRF', normal, compile, [''])
test('NFSImport', [extra_files(['NFSExport.hs'])], multimod_compile, ['NFSImport NFSExport', '-v0'])
test('T18999_NoFieldSelectors', normal, compile, [''])
=====================================
testsuite/tests/overloadedrecflds/should_fail/all.T
=====================================
@@ -20,7 +20,7 @@ test('overloadedrecfldsfail14', normal, compile_fail, [''])
test('overloadedlabelsfail01', normal, compile_fail, [''])
test('overloadedlabelsfail02', normal, compile_fail, [''])
test('overloadedlabelsfail03', normal, compile_fail, [''])
-test('T11103', normal, compile_fail, [''])
+test('T11103', req_th, compile_fail, [''])
test('T11167_ambiguous_fixity', [], multimod_compile_fail,
['T11167_ambiguous_fixity', ''])
test('T13132_duplicaterecflds', normal, compile_fail, [''])
=====================================
testsuite/tests/overloadedrecflds/should_run/all.T
=====================================
@@ -3,14 +3,14 @@ test('overloadedrecfldsrun01', [], multimod_compile_and_run,
test('overloadedrecfldsrun02', [extra_files(['OverloadedRecFldsRun02_A.hs'])], multimod_compile_and_run,
['overloadedrecfldsrun02', ''])
test('overloadedrecfldsrun03', normal, compile_and_run, [''])
-test('overloadedrecfldsrun04', omit_ways(prof_ways), compile_and_run, [''])
+test('overloadedrecfldsrun04', [req_th,omit_ways(prof_ways)], compile_and_run, [''])
test('overloadedrecfldsrun05', normal, compile_and_run, [''])
test('overloadedrecfldsrun07', normal, compile_and_run, [''])
test('overloadedrecflds_generics', normal, compile_and_run, [''])
test('overloadedlabelsrun01', normal, compile_and_run, [''])
test('overloadedlabelsrun02', normal, compile_and_run, [''])
test('overloadedlabelsrun03', normal, compile_and_run, [''])
-test('overloadedlabelsrun04', [extra_files(['OverloadedLabelsRun04_A.hs']),
+test('overloadedlabelsrun04', [req_th, extra_files(['OverloadedLabelsRun04_A.hs']),
omit_ways(prof_ways)], multimod_compile_and_run,
['overloadedlabelsrun04', config.ghc_th_way_flags])
test('hasfieldrun01', normal, compile_and_run, [''])
=====================================
testsuite/tests/parser/should_compile/all.T
=====================================
@@ -165,7 +165,8 @@ test('NegativeLiteralsNoExt', normal, compile, [''])
# (2) Build the program twice: once with -dynamic, and then
# with -prof using -osuf to set a different object file suffix.
test('proposal-229f',
- [ extra_files(['proposal-229f.hs', 'Proposal229f_instances.hs']),
+ [ req_th,
+ extra_files(['proposal-229f.hs', 'Proposal229f_instances.hs']),
omit_ways(['profasm', 'profthreaded'])
],
multimod_compile_and_run, ['proposal-229f.hs', ''])
=====================================
testsuite/tests/parser/unicode/all.T
=====================================
@@ -28,7 +28,7 @@ test('T10907', normal, compile, [''])
test('T7650', normal, compile, [''])
test('brackets', normal, compile, [''])
-test('T18225A', normal, compile, [''])
+test('T18225A', req_th, compile, [''])
test('T18225B', normal, compile_fail, [''])
test('T18158', normal, compile, [''])
=====================================
testsuite/tests/patsyn/should_run/all.T
=====================================
@@ -23,7 +23,7 @@ test('T11224', normal, compile_and_run, ['-Wincomplete-patterns -Woverlapping-pa
# (1) Use -fexternal-interpreter, or
# (2) Build the program twice: once with -dynamic, and then
# with -prof using -osuf to set a different object file suffix.
-test('T13688', omit_ways(['profasm', 'profthreaded']), multimod_compile_and_run, ['T13688', '-v0'])
+test('T13688', [req_th, omit_ways(['profasm', 'profthreaded'])], multimod_compile_and_run, ['T13688', '-v0'])
# Requires UnboxedSums, which GHCi does not support.
test('T14228', omit_ways(['ghci']), compile_and_run, [''])
test('records-poly-update', normal, compile_and_run, [''])
=====================================
testsuite/tests/polykinds/all.T
=====================================
@@ -55,7 +55,7 @@ test('T6129', normal, compile_fail,[''])
test('T7053', normal, compile,[''])
test('T7053a', normal, compile,[''])
test('T7020', normal, compile,[''])
-test('T7022', normal, makefile_test, [])
+test('T7022', req_th, makefile_test, [])
test('T7073', normal, compile,[''])
test('T7128', normal, compile,[''])
test('T7151', normal, compile_fail,[''])
=====================================
testsuite/tests/qualifieddo/should_run/all.T
=====================================
@@ -7,5 +7,5 @@ test('qdorun002', [qextra_files], multimod_compile_and_run, ['qdorun002', ''])
test('qdorun003', [qextra_files], multimod_compile_and_run, ['qdorun003', ''])
test('qdorun004', normal, compile_and_run, [''])
test('qdorun005', [qextra_files], multimod_compile_and_run, ['qdorun005', ''])
-test('qdorun006', [qextra_files], multimod_compile_and_run, ['qdorun006', ''])
+test('qdorun006', [req_th,qextra_files], multimod_compile_and_run, ['qdorun006', ''])
test('qdorun007', [qextra_files], multimod_compile_and_run, ['qdorun007', ''])
=====================================
testsuite/tests/quotes/TH_spliceViewPat/test.T
=====================================
@@ -3,6 +3,6 @@ def f(name, opts):
setTestOpts(f)
-test('TH_spliceViewPat', [extra_files(['A.hs', 'Main.hs']),
+test('TH_spliceViewPat', [req_th, extra_files(['A.hs', 'Main.hs']),
omit_ways(prof_ways)], multimod_compile_and_run,
['Main', config.ghc_th_way_flags])
=====================================
testsuite/tests/quotes/all.T
=====================================
@@ -18,7 +18,7 @@ test('T10384', normal, compile_fail, [''])
test('T16384', req_th, compile, [''])
test('T17857', normal, compile, [''])
test('T18103', normal, compile, [''])
-test('T18263', normal, compile, [''])
+test('T18263', req_th, compile, [''])
test('T18521', normal, compile, [''])
test('TH_tf2', normal, compile, ['-v0'])
=====================================
testsuite/tests/rename/should_compile/all.T
=====================================
@@ -189,4 +189,4 @@ test('unused_haddock', normal, compile, ['-haddock -Wall'])
test('T19984', normal, compile, ['-fwarn-unticked-promoted-constructors'])
test('T21654', normal, compile, ['-Wunused-top-binds'])
test('T22057', normal, compile, ['-Wall'])
-test('T22067', normal, compile, ['-Wall'])
+test('T22067', req_th, compile, ['-Wall'])
=====================================
testsuite/tests/rename/should_fail/all.T
=====================================
@@ -43,7 +43,7 @@ test('rnfail040', [extra_files(['Rnfail040_A.hs']), normalise_version('base')],
test('rnfail041', normal, compile_fail, [''])
test('rnfail042', normal, compile_fail, [''])
-test('rnfail043', unless(doing_ghci, skip), compile_fail, ['-v0'])
+test('rnfail043', [req_th,unless(doing_ghci, skip)], compile_fail, ['-v0'])
test('rnfail044', normal, compile_fail, [''])
test('rnfail045', normal, compile_fail, [''])
test('rnfail046', normal, compile_fail, [''])
@@ -176,4 +176,4 @@ test('T19843l', normal, compile_fail, [''])
test('T19843m', normal, compile_fail, [''])
test('T11167_ambig', normal, compile_fail, [''])
test('T18138', normal, compile_fail, [''])
-test('T20147', normal, compile_fail, [''])
\ No newline at end of file
+test('T20147', normal, compile_fail, [''])
=====================================
testsuite/tests/rep-poly/all.T
=====================================
@@ -10,7 +10,7 @@ test('T14561b', normal, compile_fail, [''])
test('T14765', normal, compile_fail, [''])
test('T17360', normal, compile_fail, [''])
test('T17817', normal, compile_fail, [''])
-test('T18170a', [extra_files(['T18170c.hs'])], multimod_compile, ['T18170a.hs', '-v0'])
+test('T18170a', [req_th,extra_files(['T18170c.hs'])], multimod_compile, ['T18170a.hs', '-v0'])
test('T18170b', [extra_files(['T18170c.hs']), expect_broken(19893)], multimod_compile_fail, ['T18170b.hs', '-v0'])
# T18170b isn't actually broken, but it causes a Core Lint error
# even though the program is (correctly) rejected by the typechecker
=====================================
testsuite/tests/rts/T1791/all.T
=====================================
@@ -1,4 +1,6 @@
test('T1791',
- [ exit_code(0) ],
+ [ exit_code(0)
+ , js_skip # The JS backend doesn't detect heap overflows
+ ],
run_command,
['''"$MAKE" -s --no-print-directory T1791 >/dev/null && ./T1791 +RTS -M8M'''])
=====================================
testsuite/tests/rts/all.T
=====================================
@@ -254,12 +254,14 @@ test('T5250', [extra_files(['spalign.c']),
omit_ways(['ghci']) ],
compile_and_run, ['spalign.c'])
-test('T5423', [], makefile_test, ['T5423'])
+test('T5423', [cmm_src], makefile_test, ['T5423'])
test('T5993', extra_run_opts('+RTS -k8 -RTS'), compile_and_run, [''])
test('T6006', [ omit_ways(prof_ways + ['ghci']),
- pre_cmd('$MAKE -s --no-print-directory T6006_setup') ],
+ pre_cmd('$MAKE -s --no-print-directory T6006_setup'),
+ js_skip
+ ],
# The T6006_setup hack is to ensure that we generate
# T6006_stub.h before compiling T6006_c.c, which
# needs it.
@@ -300,7 +302,7 @@ test('ffishutdown', [ignore_stderr, only_ways(['threaded1','threaded2'])],
compile_and_run, [''])
# Times out in ghci way
-test('T7919', [when(fast(), skip), omit_ways(['ghci'] + prof_ways)], compile_and_run,
+test('T7919', [req_th,when(fast(), skip), omit_ways(['ghci'] + prof_ways)], compile_and_run,
[config.ghc_th_way_flags])
test('T8035', normal, compile_and_run, [''])
@@ -430,7 +432,10 @@ test('T14702', [ ignore_stdout
]
, compile_and_run, [''])
-test('T14900', normal, compile_and_run, ['-package ghc-compact'])
+test('T14900',
+ [ js_skip # Compact regions not supported by the JS backend yet
+ ], compile_and_run, ['-package ghc-compact'])
+
test('InternalCounters', normal, makefile_test, ['InternalCounters'])
test('alloccounter1', normal, compile_and_run,
[
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/55473c85f4556499845ace1515bc3eeeac3d533a...71e12d28e9824a94cd00156eaca9b1c172936bb2
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/55473c85f4556499845ace1515bc3eeeac3d533a...71e12d28e9824a94cd00156eaca9b1c172936bb2
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/20221006/2cb42833/attachment-0001.html>
More information about the ghc-commits
mailing list