[Git][ghc/ghc][wip/js-staging] 2 commits: testsuite: disable cabal tests for JS backend

doyougnu (@doyougnu) gitlab at gitlab.haskell.org
Tue Oct 18 17:12:48 UTC 2022



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


Commits:
ec7efaa2 by doyougnu at 2022-10-18T13:03:02-04:00
testsuite: disable cabal tests for JS backend

- - - - -
0e3ef1cb by doyougnu at 2022-10-18T13:10:49-04:00
testsuite: disable bkpcabal[01-07] for JS backend

- - - - -


15 changed files:

- testsuite/tests/backpack/cabal/bkpcabal01/all.T
- testsuite/tests/backpack/cabal/bkpcabal02/all.T
- testsuite/tests/backpack/cabal/bkpcabal03/all.T
- testsuite/tests/backpack/cabal/bkpcabal04/all.T
- testsuite/tests/backpack/cabal/bkpcabal05/all.T
- testsuite/tests/backpack/cabal/bkpcabal06/all.T
- testsuite/tests/backpack/cabal/bkpcabal07/all.T
- testsuite/tests/cabal/cabal01/all.T
- testsuite/tests/cabal/cabal03/all.T
- testsuite/tests/cabal/cabal04/all.T
- testsuite/tests/cabal/cabal05/all.T
- testsuite/tests/cabal/cabal06/all.T
- testsuite/tests/cabal/cabal08/all.T
- testsuite/tests/cabal/cabal09/all.T
- testsuite/tests/cabal/cabal10/all.T


Changes:

=====================================
testsuite/tests/backpack/cabal/bkpcabal01/all.T
=====================================
@@ -5,6 +5,7 @@ else:
 
 test('bkpcabal01',
      [extra_files(['p', 'q', 'impl', 'bkpcabal01.cabal', 'Setup.hs', 'Main.hs']),
+      js_skip,
       run_timeout_multiplier(2)],
      run_command,
      ['$MAKE -s --no-print-directory bkpcabal01 ' + cleanup])


=====================================
testsuite/tests/backpack/cabal/bkpcabal02/all.T
=====================================
@@ -4,6 +4,7 @@ else:
    cleanup = 'CLEANUP=0'
 
 test('bkpcabal02',
-     extra_files(['p', 'q', 'bkpcabal02.cabal', 'Setup.hs']),
+     [extra_files(['p', 'q', 'bkpcabal02.cabal', 'Setup.hs']),
+      js_skip],
      run_command,
      ['$MAKE -s --no-print-directory bkpcabal02 ' + cleanup])


=====================================
testsuite/tests/backpack/cabal/bkpcabal03/all.T
=====================================
@@ -4,6 +4,7 @@ else:
    cleanup = 'CLEANUP=0'
 
 test('bkpcabal03',
-     extra_files(['asig1', 'asig2', 'bkpcabal03.cabal.in1', 'bkpcabal03.cabal.in2', 'Setup.hs', 'Mod.hs']),
+     [extra_files(['asig1', 'asig2', 'bkpcabal03.cabal.in1', 'bkpcabal03.cabal.in2', 'Setup.hs', 'Mod.hs']),
+      js_skip],
      run_command,
      ['$MAKE -s --no-print-directory bkpcabal03 ' + cleanup])


=====================================
testsuite/tests/backpack/cabal/bkpcabal04/all.T
=====================================
@@ -5,6 +5,7 @@ else:
 
 # Test recompilation checking on signatures
 test('bkpcabal04',
-     extra_files(['p', 'q', 'bkpcabal04.cabal.in1', 'bkpcabal04.cabal.in2', 'Setup.hs']),
+     [extra_files(['p', 'q', 'bkpcabal04.cabal.in1', 'bkpcabal04.cabal.in2', 'Setup.hs']),
+     js_skip],
      run_command,
      ['$MAKE -s --no-print-directory bkpcabal04 ' + cleanup])


=====================================
testsuite/tests/backpack/cabal/bkpcabal05/all.T
=====================================
@@ -4,6 +4,7 @@ else:
    cleanup = 'CLEANUP=0'
 
 test('bkpcabal05',
-     extra_files(['bkpcabal05.cabal', 'A.hsig.in1', 'A.hsig.in2', 'M.hs', 'Setup.hs']),
+     [extra_files(['bkpcabal05.cabal', 'A.hsig.in1', 'A.hsig.in2', 'M.hs', 'Setup.hs']),
+      js_skip],
      run_command,
      ['$MAKE -s --no-print-directory bkpcabal05 ' + cleanup])


=====================================
testsuite/tests/backpack/cabal/bkpcabal06/all.T
=====================================
@@ -5,6 +5,7 @@ else:
 
 test('bkpcabal06',
      [extra_files(['bkpcabal06.cabal', 'Setup.hs', 'sig', 'impl']),
+      js_skip,
       when(opsys('mingw32'), skip)],
      run_command,
      ['$MAKE -s --no-print-directory bkpcabal06 ' + cleanup])


=====================================
testsuite/tests/backpack/cabal/bkpcabal07/all.T
=====================================
@@ -5,6 +5,7 @@ else:
 
 test('bkpcabal07',
      [extra_files(['bkpcabal07.cabal', 'Setup.hs', 'M.hs', 'P.hsig']),
+      js_skip,
       when(opsys('mingw32'), skip)],
      run_command,
      ['$MAKE -s --no-print-directory bkpcabal07 ' + cleanup])


=====================================
testsuite/tests/cabal/cabal01/all.T
=====================================
@@ -23,6 +23,7 @@ def ignoreLdOutput(str):
 
 test('cabal01',
      [extra_files(['A.hs', 'B/', 'MainA.hs', 'Setup.lhs', 'c_src/', 'hello.c', 'test.cabal']),
-      normalise_errmsg_fun(ignoreLdOutput)],
+      normalise_errmsg_fun(ignoreLdOutput),
+      js_skip],
      run_command,
      ['$MAKE -s --no-print-directory cabal01 VANILLA=' + vanilla + ' PROF=' + prof + ' DYN=' + dyn + ' ' + cleanup])


=====================================
testsuite/tests/cabal/cabal03/all.T
=====================================
@@ -4,6 +4,7 @@ else:
    cleanup = 'CLEANUP=0'
 
 test('cabal03',
-     extra_files(['Setup.lhs', 'p/', 'q/', 'r/']),
+     [extra_files(['Setup.lhs', 'p/', 'q/', 'r/']),
+     js_skip],
      run_command,
      ['$MAKE -s --no-print-directory cabal03 ' + cleanup])


=====================================
testsuite/tests/cabal/cabal04/all.T
=====================================
@@ -19,6 +19,7 @@ else:
    cleanup = 'CLEANUP=0'
 
 test('cabal04',
-     extra_files(['Library.hs', 'Setup.lhs', 'TH.hs', 'thtest.cabal']),
+     [extra_files(['Library.hs', 'Setup.lhs', 'TH.hs', 'thtest.cabal']),
+     js_skip],
      run_command,
      ['$MAKE -s --no-print-directory cabal04 VANILLA=' + vanilla + ' PROF=' + prof + ' DYN=' + dyn + ' ' + cleanup])


=====================================
testsuite/tests/cabal/cabal05/all.T
=====================================
@@ -4,6 +4,7 @@ else:
    cleanup = 'CLEANUP=0'
 
 test('cabal05',
-     extra_files(['Setup.hs', 'p/', 'q/', 'r/', 's/', 't/']),
+     [extra_files(['Setup.hs', 'p/', 'q/', 'r/', 's/', 't/']),
+     js_skip],
      run_command,
      ['$MAKE -s --no-print-directory cabal05 ' + cleanup])


=====================================
testsuite/tests/cabal/cabal06/all.T
=====================================
@@ -4,6 +4,7 @@ else:
    cleanup = 'CLEANUP=0'
 
 test('cabal06',
-     extra_files(['Setup.hs', 'p-1.0/', 'p-1.1/', 'q/', 'r/']),
+     [extra_files(['Setup.hs', 'p-1.0/', 'p-1.1/', 'q/', 'r/']),
+     js_skip],
      run_command,
      ['$MAKE -s --no-print-directory cabal06 ' + cleanup])


=====================================
testsuite/tests/cabal/cabal08/all.T
=====================================
@@ -4,6 +4,7 @@ else:
    cleanup = 'CLEANUP=0'
 
 test('cabal08',
-     extra_files(['Main.hs', 'Setup.hs', 'p1/', 'p2/']),
+     [extra_files(['Main.hs', 'Setup.hs', 'p1/', 'p2/']),
+     js_skip],
      run_command,
      ['$MAKE -s --no-print-directory cabal08 ' + cleanup])


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


=====================================
testsuite/tests/cabal/cabal10/all.T
=====================================
@@ -4,6 +4,7 @@ else:
    cleanup = 'CLEANUP=0'
 
 test('cabal10',
-     extra_files(['Use.hs', 'Setup.hs', 'src/', 'internal-lib.cabal']),
+     [extra_files(['Use.hs', 'Setup.hs', 'src/', 'internal-lib.cabal']),
+     js_skip],
      run_command,
      ['$MAKE -s --no-print-directory cabal10 ' + cleanup])



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/0e255a2b0e0ab80d0e71ee87561d07830b68d0ec...0e3ef1cb555052dc11d91916ffa102a2ae373022

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/0e255a2b0e0ab80d0e71ee87561d07830b68d0ec...0e3ef1cb555052dc11d91916ffa102a2ae373022
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/20221018/600e89ed/attachment-0001.html>


More information about the ghc-commits mailing list