[Git][ghc/ghc][wip/cross-ci] 2 commits: NoFieldSe

[Ben Gamari (@bgamari)]

Ben Gamari pushed to branch wip/cross-ci at Glasgow Haskell Compiler / GHC


Commits:
acd4960a by Ben Gamari at 2022-10-18T13:24:27-04:00
NoFieldSe

- - - - -
a9faeb41 by Ben Gamari at 2022-10-18T13:26:38-04:00
testsuite: Introduce and use req_plugins

- - - - -


4 changed files:

- testsuite/driver/testlib.py
- testsuite/tests/overloadedrecflds/should_compile/all.T
- testsuite/tests/plugins/all.T
- testsuite/tests/tcplugins/all.T


Changes:

=====================================
testsuite/driver/testlib.py
=====================================
@@ -252,9 +252,19 @@ def req_dynamic_hs( name, opts ):
         opts.expect = 'fail'
 
 def req_interp( name, opts ):
+    '''
+    Require GHCi support
+    '''
     if not config.have_interp or isCross():
         opts.expect = 'fail'
 
+def req_plugins( name, opts ):
+    '''
+    Require plugins support
+    '''
+    # Currently no different from req_interp
+    req_interp(name, opts)
+
 def req_rts_linker( name, opts ):
     if not config.have_RTS_linker:
         opts.expect = 'fail'


=====================================
testsuite/tests/overloadedrecflds/should_compile/all.T
=====================================
@@ -3,7 +3,7 @@ test('T12609', normal, compile, [''])
 test('T16597', [], multimod_compile, ['T16597', '-v0'])
 test('T17176', normal, compile, [''])
 test('DRFPatSynExport', [], makefile_test, ['DRFPatSynExport'])
-test('NoFieldSelectors', req_interp, normal, compile, [''])
+test('NoFieldSelectors', req_interp, compile, [''])
 test('NFSDRF', normal, compile, [''])
 test('NFSImport', [extra_files(['NFSExport.hs'])], multimod_compile, ['NFSImport NFSExport', '-v0'])
 test('T18999_NoFieldSelectors', normal, compile, [''])


=====================================
testsuite/tests/plugins/all.T
=====================================
@@ -1,5 +1,5 @@
 setTestOpts([
-    req_interp,
+    req_plugins,
     # The implementation of ghc-pkg doesn't seem to be multi-concurrent process
     # safe on windows. These tests which mutate the package db need to be run
     # sequentially until this is fixed.  This likely means that #13194 isn't fully
@@ -213,7 +213,6 @@ test('test-hole-plugin',
      [extra_files(['hole-fit-plugin/']),
       pre_cmd('$MAKE -s --no-print-directory -C hole-fit-plugin package.hole-fit-plugin TOP={top}'),
       extra_hc_opts('-package-db hole-fit-plugin/pkg.hole-fit-plugin/local.package.conf '+ config.plugin_way_flags),
-      req_th
       ],
      compile, ['-fdefer-typed-holes'])
 test('test-hooks-plugin',
@@ -222,7 +221,6 @@ test('test-hooks-plugin',
       # The following doesn't seem to work, even though it
       # seems identical to the previous test...?
       # extra_hc_opts('-package-db hooks-plugin/pkg.hooks-plugin/local.package.conf '+ config.plugin_way_flags),
-      req_th
       ],
      compile_and_run,
      ['-package-db hooks-plugin/pkg.hooks-plugin/local.package.conf '+ config.plugin_way_flags])


=====================================
testsuite/tests/tcplugins/all.T
=====================================
@@ -1,3 +1,4 @@
+setTestOpts([req_plugins])
 
 # See NullaryPlugin.hs for a description of this plugin.
 test('TcPlugin_Nullary'



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/d9f06581b2b0015abae1e3899ac4e73417bc70fa...a9faeb41738ef15b728a9b4d06612c1a7038a13a

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/d9f06581b2b0015abae1e3899ac4e73417bc70fa...a9faeb41738ef15b728a9b4d06612c1a7038a13a
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/20221018/0e14cc64/attachment-0001.html>