Remove unneeded reqlibs for mtl and parsec in the GHC testsuite
authorRyan Scott <ryan.gl.scott@gmail.com>
Thu, 17 Aug 2017 14:31:26 +0000 (10:31 -0400)
committerBen Gamari <ben@smart-cactus.org>
Thu, 17 Aug 2017 20:42:55 +0000 (16:42 -0400)
Now that `mtl` and `parsec` are boot libraries, there's no need to
qualify various tests in the testsuite with `reqlib('mtl')` or
`reqlib('parsec')`.

Test Plan: make test TEST="T4809 tcfail126 T4355 tc232 tc223 tc220
tc217 tc183 T5303 DoParamM qq005 qq006 galois_raytrace T1074 mod133
T3787 T4316 prog011 drvfail006 drvfail008"

Reviewers: bgamari, austin

Subscribers: rwbarton, thomie

Differential Revision: https://phabricator.haskell.org/D3855

13 files changed:
testsuite/tests/deriving/should_fail/all.T
testsuite/tests/ghci/prog011/prog011.T
testsuite/tests/ghci/scripts/all.T
testsuite/tests/indexed-types/should_compile/all.T
testsuite/tests/module/all.T
testsuite/tests/programs/galois_raytrace/test.T
testsuite/tests/quasiquotation/qq005/test.T
testsuite/tests/quasiquotation/qq006/test.T
testsuite/tests/rebindable/all.T
testsuite/tests/simplCore/should_compile/all.T
testsuite/tests/typecheck/should_compile/all.T
testsuite/tests/typecheck/should_fail/all.T
testsuite/tests/typecheck/should_run/all.T

index 5fa589f..77ce145 100644 (file)
@@ -4,9 +4,9 @@ test('drvfail002', normal, compile_fail, [''])
 test('drvfail003', normal, compile_fail, [''])
 test('drvfail004', normal, compile_fail, [''])
 test('drvfail005', normal, compile_fail, [''])
-test('drvfail006', reqlib('mtl'), compile_fail, [''])
+test('drvfail006', normal, compile_fail, [''])
 test('drvfail007', normal, compile_fail, [''])
-test('drvfail008', reqlib('mtl'), compile_fail, [''])
+test('drvfail008', normal, compile_fail, [''])
 test('drvfail009', normal, compile_fail, [''])
 test('drvfail011', normal, compile_fail, [''])
 test('drvfail012', normal, compile_fail, [''])
index c14d457..1614aaa 100644 (file)
@@ -1,2 +1,2 @@
-test('prog011', reqlib('mtl'), ghci_script, ['prog011.script'])
+test('prog011', normal, ghci_script, ['prog011.script'])
 
index 1f4e5b1..8872cc4 100755 (executable)
@@ -115,7 +115,7 @@ test('T4087', normal, ghci_script, ['T4087.script'])
 test('T4015', normal, ghci_script, ['T4015.script'])
 test('T4127', normal, ghci_script, ['T4127.script'])
 test('T4127a', normal, ghci_script, ['T4127a.script'])
-test('T4316', reqlib('mtl'), ghci_script, ['T4316.script'])
+test('T4316', normal, ghci_script, ['T4316.script'])
 test('T4832', normal, ghci_script, ['T4832.script'])
 test('T5045', normal, ghci_script, ['T5045.script'])
 test('T5130', normal, ghci_script, ['T5130.script'])
index 359e7d5..dc166dc 100644 (file)
@@ -131,7 +131,7 @@ test('IndTypesPerf',
      ['$MAKE -s --no-print-directory IndTypesPerf'])
 
 test('T4120', normal, compile, [''])
-test('T3787', reqlib('mtl'), compile, [''])
+test('T3787', normal, compile, [''])
 test('T3826', normal, compile, [''])
 test('T4200', normal, compile, [''])
 test('T3851', normal, compile, [''])
index 5404f19..e862413 100644 (file)
@@ -179,7 +179,7 @@ test('mod131', [extra_files(['Mod131_A.hs', 'Mod131_B.hs'])], multimod_compile_f
 
 test('mod132', [extra_files(['Mod132_A.hs', 'Mod132_B.hs'])], multimod_compile_fail, ['mod132', '-v0'])
 
-test('mod133', reqlib('mtl'), compile, [''])
+test('mod133', normal, compile, [''])
 test('mod134', normal, compile_fail, [''])
 test('mod135', normal, compile_fail, [''])
 test('mod136', [extra_files(['Mod136_A.hs'])], multimod_compile_fail, ['mod136', '-v0'])
@@ -264,7 +264,7 @@ test('mod179', [extra_files(['Mod179_A.hs'])], multimod_compile, ['mod179', '-v0
 test('mod180', [extra_files(['Mod180_A.hs', 'Mod180_B.hs'])], multimod_compile_fail, ['mod180', '-v0'])
 
 test('T1148', normal, compile, [''])
-test('T1074', reqlib('mtl'), compile, [''])
+test('T1074', normal, compile, [''])
 test('T1074a', normal, compile, [''])
 test('T2267', reqlib('utf8-string'), compile, [''])
 test('T414', normal, compile_fail, [''])
index 6f65800..743cbbf 100644 (file)
@@ -4,5 +4,5 @@ if config.platform.startswith('i386-') and \
     setTestOpts(expect_fail_for(['hpc','optasm','profasm','threaded2','profthreaded']))
 
 test('galois_raytrace', [extra_files(['CSG.hs', 'Construct.hs', 'Data.hs', 'Eval.hs', 'Geometry.hs', 'Illumination.hs', 'Intersections.hs', 'Interval.hs', 'Main.hs', 'Misc.hs', 'Parse.hs', 'Primitives.hs', 'Surface.hs', 'galois.gml']),
-                         when(fast(), skip), reqlib('parsec')],
+                         when(fast(), skip)],
      multimod_compile_and_run, ['Main', '-package parsec'])
index 333981a..4e38138 100644 (file)
@@ -1,7 +1,6 @@
 test('qq005',
      [extra_files(['Expr.hs', 'Main.hs']),
       when(fast(), skip),
-      reqlib('parsec'),
       # We'd need to jump through some hoops to run this test the
       # profiling ways, due to the TH use, so for now we just
       # omit the profiling ways
index e6c4b7c..a76cd70 100644 (file)
@@ -1,3 +1,3 @@
 test('qq006', [extra_files(['Expr.hs', 'Main.hs']),
-               when(fast(), skip), reqlib('parsec')], multimod_compile_fail,
+               when(fast(), skip)], multimod_compile_fail,
      ['Main', '-v0'])
index dd51e2b..83bfa2f 100644 (file)
@@ -3,7 +3,7 @@
 #
 # Written by Ashley Yakeley
 
-# No point in doing anything except the normal way 
+# No point in doing anything except the normal way
 setTestOpts(only_ways(['normal']));
 
 test('rebindable1', normal, compile, [''])
@@ -25,7 +25,7 @@ test('T303', normal, compile, [''])
 
 # Tests from Oleg
 test('DoRestrictedM', normal, compile, [''])
-test('DoParamM', reqlib('mtl'), compile_fail, [''])
+test('DoParamM', normal, compile_fail, [''])
 test('T5038', normal, compile_and_run, [''])
 test('T4851', normal, compile, [''])
 
index b7c8b04..edc24bf 100644 (file)
@@ -113,7 +113,7 @@ test('T5168',
      ['$MAKE -s --no-print-directory T5168'])
 
 test('T5329', normal, compile, [''])
-test('T5303', reqlib('mtl'), compile, [''])   # Coercion-optimiation test
+test('T5303', normal, compile, [''])   # Coercion-optimiation test
 test('T5342', normal, compile, [''])   # Lint error with -prof
 test('T5359a', normal, compile, [''])  # Lint error with -O (OccurAnal)
 test('T5359b', normal, compile, [''])  # Lint error with -O (OccurAnal)
index c18c73b..f522b74 100644 (file)
@@ -188,7 +188,7 @@ test('tc179', normal, compile, [''])
 test('tc180', normal, compile, [''])
 test('tc181', normal, compile, [''])
 test('tc182', normal, compile, [''])
-test('tc183', reqlib('mtl'), compile, [''])
+test('tc183', normal, compile, [''])
 test('tc184', normal, compile, [''])
 test('tc185', normal, compile, [''])
 test('tc186', normal, compile, [''])
@@ -225,13 +225,13 @@ test('tc215', normal, compile, [''])
 # This one is very delicate, but I don't think the result really matters
 test('tc216', normal, compile, [''])
 
-test('tc217', reqlib('mtl'), compile, [''])
+test('tc217', normal, compile, [''])
 test('tc218', normal, compile, [''])
 test('tc219', normal, compile, [''])
-test('tc220', [reqlib('mtl'), reqlib('syb')], compile, [''])
+test('tc220', [reqlib('syb')], compile, [''])
 test('tc221', normal, compile, [''])
 test('tc222', normal, compile, [''])
-test('tc223', reqlib('mtl'), compile, [''])
+test('tc223', normal, compile, [''])
 test('tc224', normal, compile, [''])
 test('tc225', normal, compile, [''])
 test('tc226', normal, compile, [''])
@@ -240,7 +240,7 @@ test('tc228', normal, compile, [''])
 test('tc229', normal, compile, [''])
 test('tc230', normal, compile, [''])
 test('tc231', normal, compile, [''])
-test('tc232', reqlib('mtl'), compile, [''])
+test('tc232', normal, compile, [''])
 test('tc233', normal, compile, [''])
 test('tc234', normal, compile, [''])
 test('tc235', normal, compile, [''])
@@ -305,7 +305,7 @@ test('T1123', normal, compile, [''])
 test('T3692', normal, compile, [''])
 test('T700',  normal, compile, [''])
 test('T4361', normal, compile, [''])
-test('T4355', reqlib('mtl'), compile, [''])
+test('T4355', normal, compile, [''])
 test('T1634', normal, compile, [''])
 test('T4401', normal, compile, [''])
 test('T4404', normal, compile, ['-Wall'])
index d865c76..69e2e99 100644 (file)
@@ -107,7 +107,7 @@ test('tcfail122', normal, compile_fail, [''])
 test('tcfail123', normal, compile_fail, [''])
 test('tcfail124', normal, compile, [''])
 test('tcfail125', normal, compile_fail, [''])
-test('tcfail126', reqlib('mtl'), compile, [''])
+test('tcfail126', normal, compile, [''])
 test('tcfail127', normal, compile_fail, [''])
 test('tcfail128', normal, compile_fail, [''])
 test('tcfail129', normal, compile_fail, [''])
index 346c312..3fc1928 100755 (executable)
@@ -84,7 +84,7 @@ test('T3731', normal, compile_and_run, [''])
 test('T3731-short', normal, compile_and_run, [''])
 test('T3500a', normal, compile_and_run, [''])
 test('T3500b', normal, compile_and_run, [''])
-test('T4809', reqlib('mtl'), compile_and_run, [''])
+test('T4809', normal, compile_and_run, [''])
 test('T2722', normal, compile_and_run, [''])
 test('mc17', normal, compile_and_run, [''])
 test('T5759', normal, compile_and_run, [''])