[Git][ghc/ghc][wip/angerman/cross-test-suite] platform backwards compat, until libraries are patched.

[Moritz Angermann]

Moritz Angermann pushed to branch wip/angerman/cross-test-suite at Glasgow Haskell Compiler / GHC


Commits:
7c14198c by Moritz Angermann at 2020-07-07T10:18:00+08:00
platform backwards compat, until libraries are patched.

- - - - -


3 changed files:

- testsuite/driver/testglobals.py
- testsuite/driver/testlib.py
- testsuite/mk/test.mk


Changes:

=====================================
testsuite/driver/testglobals.py
=====================================
@@ -73,6 +73,7 @@ class TestConfig:
         self.no_print_summary = False
 
         # What platform are we running on?
+        self.platform = '' # XXX This needs to die eventually once all access to `platform` has been relinquished from the test-suite
         self.targetPlatform = ''
         self.hostPlatform = ''
         self.os = ''


=====================================
testsuite/driver/testlib.py
=====================================
@@ -508,6 +508,10 @@ def ghc_dynamic() -> bool:
 def fast() -> bool:
     return config.speed == 2
 
+# XXX: This needs to be removed once no remnants of platform are left.
+def platform( plat: str ) -> bool:
+    return targetPlatform( plat )
+
 def targetPlatform( plat: str ) -> bool:
     return config.targetPlatform == plat
 


=====================================
testsuite/mk/test.mk
=====================================
@@ -267,6 +267,7 @@ endif
 RUNTEST_OPTS +=  \
 	--rootdir=. \
 	--config-file=$(CONFIG) \
+	-e 'config.platform="$(TARGETPLATFORM)"' \         # XXX This needs to be removed
 	-e 'config.targetPlatform="$(TARGETPLATFORM)"' \
 	-e 'config.hostPlatform="$(HOSTPLATFORM)"' \
 	-e 'config.os="$(TargetOS_CPP)"' \



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

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/7c14198c5b64efd51a87d132fe562b0ef667f612
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/20200706/b240d244/attachment-0001.html>