[Git][ghc/ghc][wip/req_smp] 2 commits: fixup: more naming fixes

[doyougnu (@doyougnu)]

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


Commits:
f87a405f by doyougnu at 2023-01-03T07:53:03-05:00
fixup: more naming fixes

- - - - -
cab788a1 by doyougnu at 2023-01-03T07:53:04-05:00
mark failing tests as host req smp

- - - - -


6 changed files:

- testsuite/driver/testlib.py
- testsuite/tests/codeGen/should_run/all.T
- testsuite/tests/concurrent/should_run/all.T
- testsuite/tests/driver/T20030/test1/all.T
- testsuite/tests/driver/j-space/all.T
- testsuite/tests/driver/t22391/all.T


Changes:

=====================================
testsuite/driver/testlib.py
=====================================
@@ -302,7 +302,7 @@ def req_host_smp( name, opts ):
     smp. Use this when the test needs to be compiled with smp support, but may
     not necessarily be run.
     """
-    if not config.host_with_smp:
+    if not config.host_has_smp:
         opts.skip = True
 
 def req_target_smp( name, opts ):
@@ -311,7 +311,7 @@ def req_target_smp( name, opts ):
     not support smp, then mark the test as an expected fail. Use this when the
     test needs to run with smp support.
     """
-    if not config.target_with_smp:
+    if not config.target_has_smp:
         opts.expect = 'fail'
 
 def ignore_stdout(name, opts):


=====================================
testsuite/tests/codeGen/should_run/all.T
=====================================
@@ -156,7 +156,7 @@ test('T10246', normal, compile_and_run, [''])
 test('T9533', normal, compile_and_run, [''])
 test('T9533b', normal, compile_and_run, [''])
 test('T9533c', normal, compile_and_run, [''])
-test('T10414', [only_ways(['threaded2']), extra_ways(['threaded2']), req_target_smp],
+test('T10414', [only_ways(['threaded2']), extra_ways(['threaded2']), req_target_smp, req_host_smp],
      compile_and_run, ['-feager-blackholing'])
 test('T10521', normal, compile_and_run, [''])
 test('T10521b', normal, compile_and_run, [''])


=====================================
testsuite/tests/concurrent/should_run/all.T
=====================================
@@ -240,7 +240,9 @@ test('setnumcapabilities001',
      [ only_ways(['threaded1','threaded2', 'nonmoving_thr', 'profthreaded']),
        extra_run_opts('8 12 2000'),
        when(have_thread_sanitizer(), expect_broken(18808)),
-       req_target_smp ],
+       req_target_smp,
+       req_host_smp
+     ],
      compile_and_run, [''])
 
 test('T21651',
@@ -248,7 +250,9 @@ test('T21651',
        when(opsys('mingw32'),skip), # uses POSIX pipes
        when(opsys('darwin'),extra_run_opts('8 12 2000 100')),
        unless(opsys('darwin'),extra_run_opts('8 12 2000 200')), # darwin runners complain of too many open files
-       req_target_smp ],
+       req_target_smp,
+       req_host_smp
+     ],
      compile_and_run, [''])
 
 test('hs_try_putmvar001',


=====================================
testsuite/tests/driver/T20030/test1/all.T
=====================================
@@ -10,5 +10,6 @@ test('T20030_test1j',
                    , 'D.hs' , 'E.hs-boot' , 'E.hs' , 'F.hs' , 'G.hs' , 'H.hs'
                    , 'I.hs', 'J.hs-boot', 'J.hs', 'K.hs' ])
      , req_target_smp
+     , req_host_smp
      ],
      multimod_compile, ['I.hs K.hs', '-v1 -j'])


=====================================
testsuite/tests/driver/j-space/all.T
=====================================
@@ -1 +1 @@
-test('jspace', [extra_files(['genJspace']), req_target_smp], makefile_test, ['jspace'])
+test('jspace', [extra_files(['genJspace']), req_target_smp, req_host_smp], makefile_test, ['jspace'])


=====================================
testsuite/tests/driver/t22391/all.T
=====================================
@@ -1,5 +1,5 @@
 test('t22391', [extra_files(['src'])],
      multimod_compile, ['Lib', '-v1 -Wall -fhide-source-paths -isrc -fdefer-diagnostics'])
 
-test('t22391j', [req_target_smp, extra_files(['src'])],
+test('t22391j', [req_target_smp, req_host_smp, extra_files(['src'])],
      multimod_compile, ['Lib', '-v1 -Wall -fhide-source-paths -isrc -fdefer-diagnostics -j2'])



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/eb21f2f62b0ec2a1bd5a3001581658c6bfdfd170...cab788a163f391551da23b6d61ce9a83d8b404bc

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/eb21f2f62b0ec2a1bd5a3001581658c6bfdfd170...cab788a163f391551da23b6d61ce9a83d8b404bc
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/20230103/5f0bfa98/attachment-0001.html>