From d066e68792bd1f3b6c4ce8626872aa78cc5179c1 Mon Sep 17 00:00:00 2001 From: Thomas Miedema Date: Mon, 15 Feb 2016 23:31:58 +0100 Subject: Testsuite: delete only_compiler_types, assume ghc Update submodules stm, hpc and unix. Differential Revision: https://phabricator.haskell.org/D1921 --- libraries/hpc | 2 +- libraries/stm | 2 +- libraries/unix | 2 +- testsuite/driver/testlib.py | 6 --- testsuite/tests/partial-sigs/should_compile/all.T | 3 +- testsuite/tests/pmcheck/should_compile/all.T | 66 +++++++++++++++-------- 6 files changed, 48 insertions(+), 33 deletions(-) diff --git a/libraries/hpc b/libraries/hpc index 7cead32fc1..6bfeb4c73e 160000 --- a/libraries/hpc +++ b/libraries/hpc @@ -1 +1 @@ -Subproject commit 7cead32fc1f9929d69861d1b09e710bd6d374363 +Subproject commit 6bfeb4c73ef44d2074f6edb314b9735bb57b8ef1 diff --git a/libraries/stm b/libraries/stm index 302aabc379..a92741a647 160000 --- a/libraries/stm +++ b/libraries/stm @@ -1 +1 @@ -Subproject commit 302aabc3799550b487a45f4c037b9ffbc0cfbc9a +Subproject commit a92741a64796eace06bc3c86467a0d036acf6eb9 diff --git a/libraries/unix b/libraries/unix index ff1c16d4ee..861ad256e0 160000 --- a/libraries/unix +++ b/libraries/unix @@ -1 +1 @@ -Subproject commit ff1c16d4ee0c4ca043bd99a5d6741ea2d53e7000 +Subproject commit 861ad256e0a5337a1a685b1cd50ae91ee9374cab diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py index 0251884dc4..609fad8b1f 100644 --- a/testsuite/driver/testlib.py +++ b/testsuite/driver/testlib.py @@ -211,12 +211,6 @@ def _extra_ways( name, opts, ways ): # ----- -def only_compiler_types( _compiler_types ): - # Don't delete yet. The libraries unix, stm and hpc still call this function. - return lambda _name, _opts: None - -# ----- - def set_stdin( file ): return lambda name, opts, f=file: _set_stdin(name, opts, f); diff --git a/testsuite/tests/partial-sigs/should_compile/all.T b/testsuite/tests/partial-sigs/should_compile/all.T index 2d600a6f5e..0f5f7d94b2 100644 --- a/testsuite/tests/partial-sigs/should_compile/all.T +++ b/testsuite/tests/partial-sigs/should_compile/all.T @@ -51,8 +51,7 @@ test('TypeFamilyInstanceLHS', normal, compile, ['-ddump-types -fno-warn-partial- test('Uncurry', normal, compile, ['-ddump-types -fno-warn-partial-type-signatures']) test('UncurryNamed', normal, compile, ['-ddump-types -fno-warn-partial-type-signatures']) test('WarningWildcardInstantiations', normal, compile, ['-ddump-types']) -test('SplicesUsed', [req_interp, only_compiler_types(['ghc']), - extra_clean(['Splices.o', 'Splices.hi'])], +test('SplicesUsed', [req_interp, extra_clean(['Splices.o', 'Splices.hi'])], multimod_compile, ['SplicesUsed', config.ghc_th_way_flags]) test('TypedSplice', [req_interp, normal], compile, ['']) test('T10403', normal, compile, ['']) diff --git a/testsuite/tests/pmcheck/should_compile/all.T b/testsuite/tests/pmcheck/should_compile/all.T index 84c2d610f4..689109e9a6 100644 --- a/testsuite/tests/pmcheck/should_compile/all.T +++ b/testsuite/tests/pmcheck/should_compile/all.T @@ -8,20 +8,34 @@ def f( name, opts ): setTestOpts(f) # Bug reports / feature requests -test('T2006', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) -test('T2204', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) -test('T3078', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) -test('T322', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) -test('T366', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) -test('T3927a',only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) -test('T3927b',only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) -test('T3927', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) -test('T4139', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) -test('T6124', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) -test('T7669a', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) -test('T8970', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) -test('T9951b',only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) -test('T9951', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) +test('T2006', [], compile, + ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) +test('T2204', [], compile, + ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) +test('T3078', [], compile, + ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) +test('T322', [], compile, + ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) +test('T366', [], compile, + ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) +test('T3927a', [], compile, + ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) +test('T3927b', [], compile, + ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) +test('T3927', [], compile, + ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) +test('T4139', [], compile, + ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) +test('T6124', [], compile, + ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) +test('T7669a', [], compile, + ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) +test('T8970', [], compile, + ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) +test('T9951b', [], compile, + ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) +test('T9951', [], compile, + ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) test('T11303', normal, compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns +RTS -M1G -RTS']) test('T11276', compile_timeout_multiplier(0.01), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns +RTS -M1G -RTS']) test('T11303b', compile_timeout_multiplier(0.01), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns +RTS -M1G -RTS']) @@ -29,11 +43,19 @@ test('T11374', compile_timeout_multiplier(0.01), compile, ['-fwarn-incomplete-pa test('T11195', compile_timeout_multiplier(0.40), compile, ['-package ghc -fwarn-incomplete-patterns -fwarn-overlapping-patterns +RTS -M1G -RTS']) # Other tests -test('pmc001', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) -test('pmc002', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) -test('pmc003', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) -test('pmc004', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) -test('pmc005', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) -test('pmc006', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) -test('pmc007', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) -test('T11245', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) +test('pmc001', [], compile, + ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) +test('pmc002', [], compile, + ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) +test('pmc003', [], compile, + ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) +test('pmc004', [], compile, + ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) +test('pmc005', [], compile, + ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) +test('pmc006', [], compile, + ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) +test('pmc007', [], compile, + ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) +test('T11245', [], compile, + ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns']) \ No newline at end of file -- cgit v1.2.1