diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2023-02-02 16:01:56 +0100 |
|---|---|---|
| committer | Sylvain Henry <sylvain@haskus.fr> | 2023-02-06 09:36:57 +0100 |
| commit | 9325748067966f6e08adbb182f2c04d9e86f7ad8 (patch) | |
| tree | 4f46dc7807e8e3800f186f864e25519eae31a3a9 /testsuite/driver/testlib.py | |
| parent | 3c0f0c6d99486502c72e6514a40e7264baaa6afc (diff) | |
| download | haskell-wip/T22740.tar.gz | |
JS: replace "js" architecture with "javascript"wip/T22740
Despite Cabal supporting any architecture name, `cabal --check` only
supports a few built-in ones. Sadly `cabal --check` is used by Hackage
hence using any non built-in name in a package (e.g. `arch(js)`) is
rejected and the package is prevented from being uploaded on Hackage.
Luckily built-in support for the `javascript` architecture was added for
GHCJS a while ago. In order to allow newer `base` to be uploaded on
Hackage we make the switch from `js` to `javascript` architecture.
Fixes #22740.
Co-authored-by: Ben Gamari <ben@smart-cactus.org>
Diffstat (limited to 'testsuite/driver/testlib.py')
| -rw-r--r-- | testsuite/driver/testlib.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py index bc83038d2b..96ff802c0d 100644 --- a/testsuite/driver/testlib.py +++ b/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) |