[Git][ghc/ghc][wip/req_smp] 2 commits: fixup: fix naming again

[doyougnu (@doyougnu)]

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


Commits:
37f60fe4 by doyougnu at 2022-12-29T07:27:24-05:00
fixup: fix naming again

- - - - -
1d10919a by doyougnu at 2022-12-29T07:30:50-05:00
drop: more print debugging

- - - - -


3 changed files:

- testsuite/config/ghc
- testsuite/driver/runtests.py
- testsuite/driver/testglobals.py


Changes:

=====================================
testsuite/config/ghc
=====================================
@@ -48,7 +48,7 @@ if config.have_interp:
 if ghc_with_threaded_rts:
     config.run_ways.append('threaded1')
     if target_with_smp:
-        config.target_with_smp = True
+        config.target_has_smp = True
         config.run_ways.append('threaded2')
         if config.speed == 0:
             config.run_ways.append('nonmoving_thr')
@@ -230,6 +230,7 @@ def get_compiler_info():
                 main = putStrLn "Hello World!"
             '''))
             try:
+                print('TESTING !!!!!!!!!!!  ' + '{} -v0 {} -o test '.format(config.compiler, src) + ' '.join(flags),)
                 p = subprocess.run(
                     '{} -v0 {} -o test '.format(config.compiler, src) + ' '.join(flags),
                     shell=True,
@@ -253,7 +254,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.
-    config.host_with_smp = test_compile(["+RTS", "-N"])
+    config.host_has_smp = test_compile(["+RTS", "-N"])
 
     config.have_vanilla   = compiler_supports_way([])
     config.have_dynamic   = compiler_supports_way(['-dynamic'])


=====================================
testsuite/driver/runtests.py
=====================================
@@ -325,6 +325,9 @@ except subprocess.CalledProcessError:
 
 print('Allowing performance changes in: ' + ', '.join(config.allowed_perf_changes.keys()))
 
+print('Config SMP Host: ' + str(config.host_has_smp))
+print('Config SMP Target: ' + str(config.target_has_smp))
+
 # -----------------------------------------------------------------------------
 # The main dude
 


=====================================
testsuite/driver/testglobals.py
=====================================
@@ -148,10 +148,10 @@ class TestConfig:
         self.ghc_dynamic = False
 
         # Does the host RTS have SMP support?
-        self.host_with_smp = True
+        self.host_has_smp = True
 
         # Does the target have SMP support?
-        self.target_with_smp = True
+        self.target_has_smp = True
 
         # Is gdb available?
         self.have_gdb = False



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/b0d7a1e24a51d1f9e7ab6e4d57e8a12f6bd60153...1d10919a52867eac8badbb3ffe0e5450e8fc8188

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/b0d7a1e24a51d1f9e7ab6e4d57e8a12f6bd60153...1d10919a52867eac8badbb3ffe0e5450e8fc8188
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/20221229/24be202b/attachment-0001.html>