[Git][ghc/ghc][wip/req_smp] test the rts directly, avoid python 3.5 limitation

[doyougnu (@doyougnu)]

doyougnu pushed to branch wip/req_smp at Glasgow Haskell Compiler / GHC


Commits:
04466b4a by doyougnu at 2022-12-26T09:36:49-05:00
test the rts directly, avoid python 3.5 limitation

- - - - -


1 changed file:

- testsuite/config/ghc


Changes:

=====================================
testsuite/config/ghc
=====================================
@@ -229,8 +229,8 @@ def get_compiler_info():
                     '{} -v0 {} -o test '.format(config.compiler, src) + ' '.join(flags),
                     shell=True,
                     cwd=d,
-                    capture_output=True
-                    )
+                    stderr=None if config.verbose >= 3 else subprocess.DEVNULL
+                   )
             return p # return the subprocess result. Consumers may have different
                      # needs
 
@@ -242,11 +242,7 @@ def get_compiler_info():
     # itself supports smp. To support smp the host must be linked with an RTS
     # built with 'defined(THREADED_RTS) && !defined(NO_SMP)'. Thus we directly
     # query the RTS the host is linked with.
-    p = test_compile(["+RTS", "--a-dummy-flag-to-err-with"])
-
-    # try to find the -N flag in tho help output
-    supported = re.search("-N\[<n>\]" , p.stderr.decode("utf-8"))
-    config.host_with_smp = True if supported else False
+    config.host_with_smp = test_compile(["+RTS", "-N"]).returncode == 0
 
     config.have_vanilla   = compiler_supports_way([])
     config.have_dynamic   = compiler_supports_way(['-dynamic'])



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

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/04466b4aa4bfaf6492d8b921d0b27dd2de8eb5e3
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/20221226/81211428/attachment-0001.html>