[Git][ghc/ghc][wip/js-base_access] 2 commits: Change RunTest.inTreeCompilerArgs.ghcStage to account for cross-compilers

[Josh Meredith (@JoshMeredith)]

Josh Meredith pushed to branch wip/js-base_access at Glasgow Haskell Compiler / GHC


Commits:
2f3a74d2 by Josh Meredith at 2023-04-20T09:54:30+00:00
Change RunTest.inTreeCompilerArgs.ghcStage to account for cross-compilers

- - - - -
6286e89b by Josh Meredith at 2023-04-20T09:57:00+00:00
Set the test RepPolyWrappedVar2 to js_broken(23280)

- - - - -


2 changed files:

- hadrian/src/Settings/Builders/RunTest.hs
- testsuite/tests/rep-poly/all.T


Changes:

=====================================
hadrian/src/Settings/Builders/RunTest.hs
=====================================
@@ -105,7 +105,11 @@ inTreeCompilerArgs stg = do
     tables_next_to_code <- flag TablesNextToCode
     targetWithSMP       <- targetSupportsSMP
 
-    let ghcStage = succStage stg
+    cross <- flag CrossCompiling
+
+    let ghcStage
+          | cross, Stage1 <- stg = Stage1
+          | otherwise = succStage stg
     debugAssertions     <- ghcDebugAssertions <$> flavour <*> pure ghcStage
     debugged            <- ghcDebugged        <$> flavour <*> pure ghcStage
     profiled            <- ghcProfiled        <$> flavour <*> pure ghcStage


=====================================
testsuite/tests/rep-poly/all.T
=====================================
@@ -85,7 +85,7 @@ test('RepPolyUnliftedNewtype', normal, compile,
      ['-fno-warn-partial-type-signatures -fno-warn-deprecated-flags'])
 test('RepPolyWildcardPattern', normal, compile_fail, [''])
 test('RepPolyWrappedVar', normal, compile_fail, [''])
-test('RepPolyWrappedVar2', normal, compile, [''])
+test('RepPolyWrappedVar2', js_broken(23280), compile, [''])
 test('UnliftedNewtypesCoerceFail', normal, compile_fail, [''])
 test('UnliftedNewtypesLevityBinder', normal, compile_fail, [''])
 



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/737b258c858f39227b5a581bac84072602b4e0db...6286e89bcf73debe22dc54be13b348d099d0f7cc

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/737b258c858f39227b5a581bac84072602b4e0db...6286e89bcf73debe22dc54be13b348d099d0f7cc
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/20230420/b5933daf/attachment-0001.html>