[Git][ghc/ghc][wip/js-staging] add req_js_compactor, update impacted tests

[doyougnu (@doyougnu)]

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


Commits:
855e0915 by doyougnu at 2022-10-25T13:21:29-04:00
add req_js_compactor, update impacted tests

Issue: https://gitlab.haskell.org/ghc/ghc/-/issues/22352

- - - - -


12 changed files:

- testsuite/driver/testlib.py
- testsuite/tests/cabal/t20242/all.T
- testsuite/tests/driver/recomp007/all.T
- testsuite/tests/driver/recompChangedPackage/all.T
- testsuite/tests/driver/recompTHpackage/all.T
- testsuite/tests/ghc-api/all.T
- testsuite/tests/ghc-api/annotations-literals/all.T
- testsuite/tests/ghc-api/apirecomp001/all.T
- testsuite/tests/ghc-api/downsweep/all.T
- testsuite/tests/patsyn/should_compile/T13350/all.T
- testsuite/tests/typecheck/T13168/all.T
- testsuite/tests/typecheck/bug1465/all.T


Changes:

=====================================
testsuite/driver/testlib.py
=====================================
@@ -293,6 +293,12 @@ def req_smp( name, opts ):
     if not config.have_smp:
         opts.expect = 'fail'
 
+def req_js_compactor( name, opts ):
+    """
+    Mark a test as requiring the JS Compactor optimization.
+    """
+    js_skip(name, opts)
+
 def ignore_stdout(name, opts):
     opts.ignore_stdout = True
 


=====================================
testsuite/tests/cabal/t20242/all.T
=====================================
@@ -4,6 +4,6 @@ else:
    cleanup = 'CLEANUP=0'
 
 test('T20242',
-     [extra_files(['Setup.hs', 'BootNoHeader.cabal','Foo.hs', 'Foo.hs-boot', 'Main.hs']), js_skip],
+     [extra_files(['Setup.hs', 'BootNoHeader.cabal','Foo.hs', 'Foo.hs-boot', 'Main.hs']), req_js_compactor],
      run_command,
      ['$MAKE -s --no-print-directory T20242 ' + cleanup])


=====================================
testsuite/tests/driver/recomp007/all.T
=====================================
@@ -5,5 +5,5 @@
 test('recomp007', [ extra_files(['Setup.hs', 'a1/', 'a2/', 'b/'])
                   , when(fast(), skip)
                   , normalise_slashes
-                  , js_skip
+                  , req_js_compactor
                   ], makefile_test, [])


=====================================
testsuite/tests/driver/recompChangedPackage/all.T
=====================================
@@ -15,7 +15,7 @@ else:
 
 test('recompChangedPackage',
      [ extra_files(['q', 'Main.hs', 'Setup.hs', 'PLib1.hs']),
-       js_skip,
+       req_js_compactor,
        when(fast(), skip)
      ],
      run_command,


=====================================
testsuite/tests/driver/recompTHpackage/all.T
=====================================
@@ -15,6 +15,6 @@ else:
 
 test('recompTHpackage', [extra_files(['p', 'q', 'Setup.hs']),
                    when(fast(), skip),
-                   js_skip],
+                   req_js_compactor],
      run_command,
      ['$MAKE -s --no-print-directory recompTHpackage VANILLA=' + vanilla + ' PROF=' + prof + ' DYN=' + dyn])


=====================================
testsuite/tests/ghc-api/all.T
=====================================
@@ -1,5 +1,5 @@
 test('ghcApi', normal, compile_and_run, ['-package ghc'])
-test('T6145', js_skip, makefile_test, ['T6145'])
+test('T6145', req_js_compactor, makefile_test, ['T6145'])
 test('T8639_api', req_rts_linker,
               makefile_test, ['T8639_api'])
 test('T8628', req_rts_linker,


=====================================
testsuite/tests/ghc-api/annotations-literals/all.T
=====================================
@@ -1,2 +1,2 @@
-test('literals', [normalise_slashes, extra_files(['LiteralsTest.hs']), js_skip], makefile_test, ['literals'])
-test('parsed', [extra_files(['LiteralsTest2.hs']), js_skip], makefile_test, ['parsed'])
+test('literals', [normalise_slashes, extra_files(['LiteralsTest.hs']), req_js_compactor], makefile_test, ['literals'])
+test('parsed', [extra_files(['LiteralsTest2.hs']), req_js_compactor], makefile_test, ['parsed'])


=====================================
testsuite/tests/ghc-api/apirecomp001/all.T
=====================================
@@ -1,4 +1,4 @@
 test('apirecomp001',
      [extra_files(['A.hs', 'B.hs', 'myghc.hs']),
-     js_skip],
+     req_js_compactor],
      makefile_test, ['apirecomp001'])


=====================================
testsuite/tests/ghc-api/downsweep/all.T
=====================================
@@ -1,7 +1,7 @@
 test('PartialDownsweep',
      [ extra_run_opts('"' + config.libdir + '"')
      , ignore_stderr
-     , js_skip
+     , req_js_compactor
      ],
      compile_and_run,
      ['-package ghc -package exceptions'])


=====================================
testsuite/tests/patsyn/should_compile/T13350/all.T
=====================================
@@ -2,5 +2,5 @@
 
 test('T13350',
      [extra_files(['T13350.hs', 'boolean']),
-     js_skip],
+     req_js_compactor],
      makefile_test, ['T13350'])


=====================================
testsuite/tests/typecheck/T13168/all.T
=====================================
@@ -1,3 +1,3 @@
 test('T13168',
-     [extra_files(['package1', 'package2', 'Setup.hs']), js_skip],
+     [extra_files(['package1', 'package2', 'Setup.hs']), req_js_compactor],
      makefile_test, [])


=====================================
testsuite/tests/typecheck/bug1465/all.T
=====================================
@@ -1 +1 @@
-test('bug1465', [extra_files(['B1.hs', 'B2.hs', 'C.hs', 'v1/', 'v2/']), js_skip], makefile_test, [])
+test('bug1465', [extra_files(['B1.hs', 'B2.hs', 'C.hs', 'v1/', 'v2/']), req_js_compactor], makefile_test, [])



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

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/855e0915bd5119e6880605f90ddc976eb34eb933
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/20221025/dd9ade45/attachment-0001.html>