[Git][ghc/ghc][wip/js-staging] Disable more tests

Sylvain Henry (@hsyl20) gitlab at gitlab.haskell.org
Mon Oct 17 14:50:16 UTC 2022



Sylvain Henry pushed to branch wip/js-staging at Glasgow Haskell Compiler / GHC


Commits:
b7b68b67 by Sylvain Henry at 2022-10-17T16:53:40+02:00
Disable more tests

- - - - -


5 changed files:

- testsuite/tests/concurrent/should_run/all.T
- testsuite/tests/driver/T12674/all.T
- testsuite/tests/driver/all.T
- testsuite/tests/driver/fat-iface/all.T
- testsuite/tests/ffi/should_run/all.T


Changes:

=====================================
testsuite/tests/concurrent/should_run/all.T
=====================================
@@ -17,7 +17,10 @@ test('conc069a', only_threaded_ways, compile_and_run, [''])
 # those for now.
 test('conc070', only_threaded_ways, compile_and_run, [''])
 
-test('conc071', omit_ways(concurrent_ways), compile_and_run, [''])
+test('conc071',
+  [ omit_ways(concurrent_ways)
+  , js_skip # JS RTS doesn't report the same cap/locked status
+  ] , compile_and_run, [''])
 test('conc072', only_ways(concurrent_ways), compile_and_run, [''])
 test('conc073', normal, compile_and_run, [''])
 


=====================================
testsuite/tests/driver/T12674/all.T
=====================================
@@ -1,6 +1,10 @@
 test('T12674', [extra_files(['-T12674.hs', '-T12674c.c']),
-                when(opsys('darwin') and arch('aarch64'), skip)],
+                when(opsys('darwin') and arch('aarch64'), skip),
+                js_skip # require support for C sources
+                ],
                 makefile_test, [])
 test('T12674w', [extra_files(['-T12674.hs', '-T12674c.c']),
-                unless(opsys('mingw32'), skip)],
+                unless(opsys('mingw32'), skip),
+                js_skip # require support for C sources
+                ],
                 makefile_test, [])


=====================================
testsuite/tests/driver/all.T
=====================================
@@ -138,7 +138,10 @@ test('T5313',
 test('T2464', normal, compile, [''])
 test('T3674', [], makefile_test, [])
 
-test('rtsopts001', [extra_files(['rtsOpts.hs'])], makefile_test, [])
+test('rtsopts001',
+  [ extra_files(['rtsOpts.hs'])
+  , js_skip # JS RTS doesn't support -rtsopts
+  ], makefile_test, [])
 test('rtsopts002', normal, makefile_test, [])
 
 test('withRtsOpts', [], makefile_test, [])
@@ -267,10 +270,12 @@ test('json', normal, compile_fail, ['-ddump-json'])
 # won't tell.  It looks unrelated and is annoying to debug. Hence we disable the
 # warning to prevent spurious errors.
 test('json2', normalise_version('base','ghc-prim'), compile, ['-ddump-types -ddump-json -Wno-unsupported-llvm-version'])
-test('T16167', exit_code(1), run_command,
+test('T16167', [req_interp,exit_code(1)], run_command,
      ['{compiler} -x hs -e ":set prog T16167.hs" -ddump-json T16167.hs'])
 test('T13604', [], makefile_test, [])
-test('T13604a', [], makefile_test, [])
+test('T13604a',
+  [ js_broken(22261) # require HPC support
+  ], makefile_test, [])
 # omitting hpc and profasm because they affect the
 # inlining and unfoldings
 test('inline-check', omit_ways(['hpc', 'profasm'])
@@ -294,7 +299,7 @@ test('FullGHCVersion', normal, compile_and_run, ['-package ghc-boot'])
 test('OneShotTH', req_th, makefile_test, [])
 test('T17481', normal, makefile_test, [])
 test('T20084', normal, makefile_test, [])
-test('RunMode', extra_files(['RunMode/Test.hs']), run_command, ['{compiler} --run -iRunMode/ -ignore-dot-ghci RunMode.hs -- hello'])
+test('RunMode', [req_interp, extra_files(['RunMode/Test.hs'])], run_command, ['{compiler} --run -iRunMode/ -ignore-dot-ghci RunMode.hs -- hello'])
 test('T20439', normal, run_command,
      ['echo "module Foo where" >> Foo.hs && \
       {compiler} -E -fno-code -XCPP -v Foo.hs 2>&1 | grep "Copying" | sed "s/.*to//" '])


=====================================
testsuite/tests/driver/fat-iface/all.T
=====================================
@@ -3,17 +3,17 @@ test('fat005', [extra_files(['Fat.hs']), filter_stdout_lines(r'= Proto-BCOs')],
 test('fat006', [extra_files(['Fat.hs'])], makefile_test, ['fat006'])
 test('fat006a', [extra_files(['Fat.hs'])], makefile_test, ['fat006a'])
 test('fat007', [extra_files(['Fat.hs'])], makefile_test, ['fat007'])
-test('fat008', [unless(ghc_dynamic(), skip), extra_files(['FatTH.hs', 'FatQuote.hs']), copy_files], makefile_test, ['fat008'])
-test('fat009', [extra_files(['FatTH.hs', 'FatQuote.hs']), copy_files], makefile_test, ['fat009'])
+test('fat008', [req_th, unless(ghc_dynamic(), skip), extra_files(['FatTH.hs', 'FatQuote.hs']), copy_files], makefile_test, ['fat008'])
+test('fat009', [req_th, extra_files(['FatTH.hs', 'FatQuote.hs']), copy_files], makefile_test, ['fat009'])
 test('fat010', [extra_files(['THA.hs', 'THB.hs', 'THC.hs']), copy_files], makefile_test, ['fat010'])
 # Check linking works when using -fbyte-code-and-object-code
-test('fat011', [extra_files(['FatMain.hs', 'FatTH.hs', 'FatQuote.hs'])], multimod_compile, ['FatMain', '-fbyte-code-and-object-code -fprefer-byte-code'])
+test('fat011', [req_th, extra_files(['FatMain.hs', 'FatTH.hs', 'FatQuote.hs'])], multimod_compile, ['FatMain', '-fbyte-code-and-object-code -fprefer-byte-code'])
 # Check that we use interpreter rather than enable dynamic-too if needed for TH
-test('fat012', [unless(ghc_dynamic(), skip), extra_files(['FatTH.hs', 'FatQuote.hs'])], multimod_compile, ['FatTH', '-fprefer-byte-code'])
+test('fat012', [req_th, unless(ghc_dynamic(), skip), extra_files(['FatTH.hs', 'FatQuote.hs'])], multimod_compile, ['FatTH', '-fprefer-byte-code'])
 # Check that no objects are generated if using -fno-code and -fprefer-byte-code
-test('fat013', [extra_files(['FatTH.hs', 'FatQuote.hs'])], multimod_compile, ['FatTH', '-fno-code -fprefer-byte-code'])
+test('fat013', [req_th, extra_files(['FatTH.hs', 'FatQuote.hs'])], multimod_compile, ['FatTH', '-fno-code -fprefer-byte-code'])
 # When using interpreter should not produce objects
-test('fat014', [extra_files(['FatTH.hs', 'FatQuote.hs'])], makefile_test, ['fat014'])
-test('fat015', [unless(ghc_dynamic(), skip), extra_files(['FatQuote.hs', 'FatQuote1.hs', 'FatQuote2.hs', 'FatTH1.hs', 'FatTH2.hs', 'FatTHTop.hs'])], multimod_compile, ['FatTHTop', '-fno-code -fwrite-interface'])
+test('fat014', [req_th, extra_files(['FatTH.hs', 'FatQuote.hs'])], makefile_test, ['fat014'])
+test('fat015', [req_th, unless(ghc_dynamic(), skip), extra_files(['FatQuote.hs', 'FatQuote1.hs', 'FatQuote2.hs', 'FatTH1.hs', 'FatTH2.hs', 'FatTHTop.hs'])], multimod_compile, ['FatTHTop', '-fno-code -fwrite-interface'])
 
 


=====================================
testsuite/tests/ffi/should_run/all.T
=====================================
@@ -7,9 +7,12 @@
 test('fed001', normal, compile_and_run, [''])
 
 # Omit GHCi for these two, as they use foreign export
-test('ffi001', omit_ways(['ghci']), compile_and_run, [''])
-test('ffi002', [ omit_ways(['ghci']),
-                 pre_cmd('$MAKE -s --no-print-directory ffi002_setup') ],
+test('ffi001', [ omit_ways(['ghci'])
+               , js_skip # JS backend doesn't support foreign export yet
+               ], compile_and_run, [''])
+test('ffi002', [ omit_ways(['ghci'])
+               , js_skip # JS backend doesn't support foreign export yet
+               , pre_cmd('$MAKE -s --no-print-directory ffi002_setup') ],
                  # The ffi002_setup hack is to ensure that we generate
                  # ffi002_stub.h before compiling ffi002_c.c, which
                  # needs it.
@@ -43,7 +46,9 @@ test('ffi006', normal, compile_and_run, [''])
 # Sometimes we end up with the wrong exit code, or get an extra
 # 'interrupted' message from the GHCi thread shutting down.
 
-test('ffi007', omit_ways(['ghci']), compile_and_run, [''])
+test('ffi007', [ omit_ways(['ghci'])
+               , js_skip # foreign "dynamic" call
+               ], compile_and_run, [''])
 test('ffi008', [exit_code(1), omit_ways(['ghci'])], compile_and_run, [''])
 
 # On i386, we need -msse2 to get reliable floating point results
@@ -76,7 +81,9 @@ test('ffi014', [only_ways(['threaded1', 'threaded2'])], compile_and_run,
 test('ffi015', [omit_ways(['ghci']), js_skip_csources], compile_and_run, ['ffi015_cbits.c'])
 
 # GHCi can't handle foreign import "&"
-test('ffi016', omit_ways(['ghci']), compile_and_run, [''])
+test('ffi016', [ omit_ways(['ghci'])
+               , js_skip # foreign exports
+               ], compile_and_run, [''])
 
 test('ffi017', normal, compile_and_run, [''])
 



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b7b68b6785d38020b7b880482db0563b1fc6d4db

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b7b68b6785d38020b7b880482db0563b1fc6d4db
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/20221017/812aa9cb/attachment-0001.html>


More information about the ghc-commits mailing list