[Git][ghc/ghc][wip/T22740] Even more

[Sylvain Henry (@hsyl20)]

Sylvain Henry pushed to branch wip/T22740 at Glasgow Haskell Compiler / GHC


Commits:
c2775e19 by Sylvain Henry at 2023-02-02T16:07:08+01:00
Even more

- - - - -


4 changed files:

- testsuite/config/ghc
- testsuite/driver/testlib.py
- testsuite/tests/concurrent/should_run/all.T
- testsuite/tests/numeric/should_run/all.T


Changes:

=====================================
testsuite/config/ghc
=====================================
@@ -70,12 +70,12 @@ if windows:
         config.other_ways += winio_ways
 
 # LLVM
-if not config.unregisterised and not config.arch == "js" and config.have_llvm:
+if not config.unregisterised and not config.arch == "javascript" and config.have_llvm:
     config.compile_ways.append('optllvm')
     config.run_ways.append('optllvm')
 
 # HPC
-if not config.arch == "js":
+if not config.arch == "javascript":
     config.compile_ways.append('hpc')
     config.run_ways.append('hpc')
 


=====================================
testsuite/driver/testlib.py
=====================================
@@ -139,12 +139,12 @@ def skip( name, opts ):
 
 # disable test on JS arch
 def js_skip( name, opts ):
-    if arch("js"):
+    if arch("javascript"):
         skip(name,opts)
 
 # expect broken for the JS backend
 def js_broken( bug: IssueNumber ):
-    if arch("js"):
+    if arch("javascript"):
         return expect_broken(bug);
     else:
         return normal;
@@ -2364,7 +2364,7 @@ def normalise_errmsg(s: str) -> str:
     # The inplace ghc's are called ghc-stage[123] to avoid filename
     # collisions, so we need to normalise that to just "ghc"
     s = re.sub('ghc-stage[123]', 'ghc', s)
-    # Remove platform prefix (e.g. js-unknown-ghcjs) for cross-compiled tools
+    # Remove platform prefix (e.g. javascript-unknown-ghcjs) for cross-compiled tools
     # (ghc, ghc-pkg, unlit, etc.)
     s = re.sub('\\w+-\\w+-\\w+-ghc', 'ghc', s)
     s = re.sub('\\w+-\\w+-\\w+-unlit', 'unlit', s)


=====================================
testsuite/tests/concurrent/should_run/all.T
=====================================
@@ -130,7 +130,7 @@ test('conc012',
 test('conc013', normal, compile_and_run, [''])
 test('conc014', normal, compile_and_run, [''])
 test('conc015',
-  [ when(arch("js"), fragile(22261)) # delays are flaky with the JS backend when the system is overloaded
+  [ when(arch("javascript"), fragile(22261)) # delays are flaky with the JS backend when the system is overloaded
   ], compile_and_run, [''])
 test('conc015a', normal, compile_and_run, [''])
 test('conc016', [omit_ways(concurrent_ways)  # see comment in conc016.hs


=====================================
testsuite/tests/numeric/should_run/all.T
=====================================
@@ -63,7 +63,7 @@ test('T9407', normal, compile_and_run, [''])
 test('T9810', normal, compile_and_run, [''])
 test('T10011', normal, compile_and_run, [''])
 test('T10962', omit_ways(['ghci']), compile_and_run, ['-O2'])
-test('T11702', [unless(arch("js"),extra_ways(['optasm']))], compile_and_run, [''])
+test('T11702', [unless(arch("javascript"),extra_ways(['optasm']))], compile_and_run, [''])
 test('T12136', normal, compile_and_run, [''])
 test('T15301', normal, compile_and_run, ['-O2'])
 test('T497', normal, compile_and_run, ['-O'])



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

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/c2775e1939a4355054bfaa4d79539026b0527605
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/20230202/8117d5db/attachment-0001.html>