diff options
author | Max Bolingbroke <batterseapower@hotmail.com> | 2011-04-02 11:25:01 +0100 |
---|---|---|
committer | Max Bolingbroke <batterseapower@hotmail.com> | 2011-04-02 11:25:01 +0100 |
commit | dc34ea9fd80f493e00062c276b2c7c898505bca2 (patch) | |
tree | 1d51dcd85f093f7a8be1a7b1a2a0cd02d2dad2e0 /testsuite | |
parent | 30e45295140bada35fc655154bc1874515900212 (diff) | |
download | haskell-dc34ea9fd80f493e00062c276b2c7c898505bca2.tar.gz |
Remove any mention of optc/profc from all.T files
Diffstat (limited to 'testsuite')
25 files changed, 44 insertions, 48 deletions
diff --git a/testsuite/tests/ghc-regress/annotations/should_compile/all.T b/testsuite/tests/ghc-regress/annotations/should_compile/all.T index f5f9c27516..851bf92468 100644 --- a/testsuite/tests/ghc-regress/annotations/should_compile/all.T +++ b/testsuite/tests/ghc-regress/annotations/should_compile/all.T @@ -5,7 +5,7 @@ setTestOpts(if_compiler_profiled(skip)) # order for this to work with profiling, we would have to build the # program twice and use -osuf p_o (see the TH_splitE5_prof test). For # now, just disable the profiling ways. -test('ann01', omit_ways(['profc','profasm','profthreaded']), compile, ['-v0']) +test('ann01', omit_ways(['profasm','profthreaded']), compile, ['-v0']) """" Helpful things to C+P: diff --git a/testsuite/tests/ghc-regress/annotations/should_run/all.T b/testsuite/tests/ghc-regress/annotations/should_run/all.T index b945b9a503..22256b2f85 100644 --- a/testsuite/tests/ghc-regress/annotations/should_run/all.T +++ b/testsuite/tests/ghc-regress/annotations/should_run/all.T @@ -11,7 +11,7 @@ test('annrun01', 'annrun01.hi', 'annrun01.o', 'Config.hs', 'Config.hi', 'Config.o']), pre_cmd('$MAKE -s config'), - omit_ways(['profc','profasm','profthreaded', 'dyn'])], + omit_ways(['profasm','profthreaded', 'dyn'])], multimod_compile_and_run, ['annrun01', '-package ghc'] ) diff --git a/testsuite/tests/ghc-regress/codeGen/should_compile/all.T b/testsuite/tests/ghc-regress/codeGen/should_compile/all.T index ebb0f8282b..98fa0a23e5 100644 --- a/testsuite/tests/ghc-regress/codeGen/should_compile/all.T +++ b/testsuite/tests/ghc-regress/codeGen/should_compile/all.T @@ -1,8 +1,8 @@ test('cg001', only_compiler_types(['ghc']), compile, ['']) test('cg002', normal, compile, ['']) -test('cg003', only_ways(['optc','optasm']), compile, ['']) +test('cg003', only_ways(['optasm']), compile, ['']) test('cg004', normal, compile, ['']) -test('cg005', only_ways(['optc','optasm']), compile, ['']) +test('cg005', only_ways(['optasm']), compile, ['']) test('cg006', normal, compile, ['']) test('cg007', normal, compile, ['']) diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/all.T b/testsuite/tests/ghc-regress/codeGen/should_run/all.T index bad83e043f..48bb06c670 100644 --- a/testsuite/tests/ghc-regress/codeGen/should_run/all.T +++ b/testsuite/tests/ghc-regress/codeGen/should_run/all.T @@ -48,7 +48,7 @@ test('cgrun049', normal, compile_and_run, ['-funbox-strict-fields']) test('cgrun050', normal, compile_and_run, ['']) # Doesn't work with External Core due to datatype declaration with no constructors test('cgrun051', (compose (expect_fail_for(['extcore','optextcore']),exit_code(1))), compile_and_run, ['']) -test('cgrun052', only_ways(['optc','optasm']), compile_and_run, ['-funbox-strict-fields']) +test('cgrun052', only_ways(['optasm']), compile_and_run, ['-funbox-strict-fields']) test('cgrun053', normal, compile_and_run, ['']) test('cgrun054', normal, compile_and_run, ['']) test('cgrun055', normal, compile_and_run, ['']) diff --git a/testsuite/tests/ghc-regress/cpranal/should_compile/all.T b/testsuite/tests/ghc-regress/cpranal/should_compile/all.T index 3c270b0277..99ffed997f 100644 --- a/testsuite/tests/ghc-regress/cpranal/should_compile/all.T +++ b/testsuite/tests/ghc-regress/cpranal/should_compile/all.T @@ -1,6 +1,6 @@ # Just do the opt way... def f( opts ): - opts.only_ways = ['optc','optasm'] + opts.only_ways = ['optasm'] setTestOpts(f) diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/all.T b/testsuite/tests/ghc-regress/deSugar/should_compile/all.T index 2648ba4962..244170927b 100644 --- a/testsuite/tests/ghc-regress/deSugar/should_compile/all.T +++ b/testsuite/tests/ghc-regress/deSugar/should_compile/all.T @@ -78,7 +78,7 @@ test('T4371', normal, compile, ['']) test('T4439', normal, compile, ['']) test('T4488', if_compiler_lt('ghc', '7.1', expect_fail), compile, ['']) test('T4870', - [only_ways(['optc','optasm']), + [only_ways(['optasm']), only_compiler_types(['ghc']), extra_clean(['T4870a.hi', 'T4870a.o'])], multimod_compile, diff --git a/testsuite/tests/ghc-regress/driver/all.T b/testsuite/tests/ghc-regress/driver/all.T index 1b882f524a..e7d9cef30e 100644 --- a/testsuite/tests/ghc-regress/driver/all.T +++ b/testsuite/tests/ghc-regress/driver/all.T @@ -328,7 +328,7 @@ test('dynHelloWorld', compile_and_run, ['']) -test('2464', omit_ways(['optc', 'profc']), compile, ['']) +test('2464', normal, compile, ['']) test('3674', ignore_output, run_command, ['$MAKE -s --no-print-directory 3674']) diff --git a/testsuite/tests/ghc-regress/ffi/should_run/all.T b/testsuite/tests/ghc-regress/ffi/should_run/all.T index d897a656aa..f43dc3a682 100644 --- a/testsuite/tests/ghc-regress/ffi/should_run/all.T +++ b/testsuite/tests/ghc-regress/ffi/should_run/all.T @@ -32,7 +32,7 @@ test('ffi004', skip, compile_and_run, ['']) # use of 80-bit internal precision when using the native code generator. # test('ffi005', [ omit_ways(prof_ways), - if_arch('i386', only_ways(['optc'])), + if_arch('i386', skip), if_platform('i386-apple-darwin', expect_broken(4105)), exit_code(3) ], compile_and_run, ['']) @@ -65,7 +65,7 @@ if config.platform.startswith('i386-'): version_ge(config.compiler_version, '6.13'): opts = '-msse2' else: - maybe_skip = only_ways(['optc','profc','ghci']) + maybe_skip = only_ways(['ghci']) test('ffi009', [skip_if_fast, expect_fail_for(['extcore','optextcore']), maybe_skip] ,compile_and_run, [opts]) diff --git a/testsuite/tests/ghc-regress/haddock/haddock_examples/test.T b/testsuite/tests/ghc-regress/haddock/haddock_examples/test.T index 95a35b8d2b..856bf73bfd 100644 --- a/testsuite/tests/ghc-regress/haddock/haddock_examples/test.T +++ b/testsuite/tests/ghc-regress/haddock/haddock_examples/test.T @@ -1,5 +1,5 @@ test('haddock.Test', - [omit_ways(['optc', 'optasm', 'profasm']), + [omit_ways(['optasm', 'profasm']), extra_clean(['Test.hi', 'Test.o', 'Hidden.hi', 'Hidden.o', 'Visible.hi', 'Visible.o'])], multimod_compile, diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/all.T b/testsuite/tests/ghc-regress/indexed-types/should_fail/all.T index 456a0a3ce4..f2d904d32e 100644 --- a/testsuite/tests/ghc-regress/indexed-types/should_fail/all.T +++ b/testsuite/tests/ghc-regress/indexed-types/should_fail/all.T @@ -1,5 +1,5 @@ setTestOpts(only_compiler_types(['ghc'])) -setTestOpts(omit_ways(['optc', 'optasm'])) +setTestOpts(omit_ways(['optasm'])) test('SimpleFail1a', normal, compile_fail, ['']) test('SimpleFail1b', normal, compile_fail, ['']) diff --git a/testsuite/tests/ghc-regress/indexed-types/should_run/all.T b/testsuite/tests/ghc-regress/indexed-types/should_run/all.T index c504778353..454e702c0e 100644 --- a/testsuite/tests/ghc-regress/indexed-types/should_run/all.T +++ b/testsuite/tests/ghc-regress/indexed-types/should_run/all.T @@ -1,5 +1,5 @@ setTestOpts(only_compiler_types(['ghc'])) -setTestOpts(omit_ways(['optc', 'hpc', 'ghci', 'threaded1', 'threaded2'])) +setTestOpts(omit_ways(['hpc', 'ghci', 'threaded1', 'threaded2'])) test('T2985', normal, compile_and_run, ['']) test('T4235', normal, compile_and_run, ['']) diff --git a/testsuite/tests/ghc-regress/parser/should_compile/all.T b/testsuite/tests/ghc-regress/parser/should_compile/all.T index 44e8297b75..e0371719d2 100644 --- a/testsuite/tests/ghc-regress/parser/should_compile/all.T +++ b/testsuite/tests/ghc-regress/parser/should_compile/all.T @@ -18,7 +18,7 @@ test('read011', normal, compile, ['']) # test('read012', normal, compile, ['']) # test('read013', normal, compile, ['']) -test('read014', omit_ways(['optc', 'profc']), compile, ['-Wall -fno-warn-orphans']) +test('read014', normal, compile, ['-Wall -fno-warn-orphans']) test('read015', normal, compile, ['']) test('read016', normal, compile, ['']) test('read017', normal, compile, ['']) @@ -69,8 +69,8 @@ test('read054', normal, compile, ['']) test('read055', normal, compile, ['']) test('read056', normal, compile, ['']) test('read057', normal, compile, ['']) -test('read058', omit_ways(['optc', 'profc']), compile, ['']) -test('read059', omit_ways(['optc', 'profc']), compile, ['']) +test('read058', omit_ways(['profc']), compile, ['']) +test('read059', omit_ways(['profc']), compile, ['']) test('read060', normal, compile, ['']) test('read061', normal, compile, ['']) test('read062', normal, compile, ['']) diff --git a/testsuite/tests/ghc-regress/perf/should_run/all.T b/testsuite/tests/ghc-regress/perf/should_run/all.T index 461f2cfc64..706b33d0ba 100644 --- a/testsuite/tests/ghc-regress/perf/should_run/all.T +++ b/testsuite/tests/ghc-regress/perf/should_run/all.T @@ -52,9 +52,7 @@ else: # I don't understand why optc and profc are giving slightly different results # on x86 here --SDM. -test('T4321', [ omit_ways(['ghci']), - if_arch('i386', expect_fail_for(['optc','profc'])) ], - compile_and_run, ['-O ' + sse2_opts]) +test('T4321', omit_ways(['ghci']), compile_and_run, ['-O ' + sse2_opts]) test('T3736', normal, run_command, ['$MAKE -s --no-print-directory T3736']) test('T3738', diff --git a/testsuite/tests/ghc-regress/perf/space_leaks/all.T b/testsuite/tests/ghc-regress/perf/space_leaks/all.T index 65d09d2fe9..7be1aaab36 100644 --- a/testsuite/tests/ghc-regress/perf/space_leaks/all.T +++ b/testsuite/tests/ghc-regress/perf/space_leaks/all.T @@ -16,7 +16,7 @@ test('space_leak_001', # 9331570416 (x86/Linux) # 9329073952 (x86/OS X) # 9327959840 (x86/Windows) - omit_ways(['profc','profasm','profthreaded','threaded1','threaded2']) + omit_ways(['profasm','profthreaded','threaded1','threaded2']) ], compile_and_run, ['']) @@ -26,6 +26,6 @@ test('T4334', [extra_run_opts('1000000 2 t'), stats_num_field('peak_megabytes_allocated', 1, 3), # prof ways don't work well with +RTS -V0 - omit_ways(['profc','profasm','profthreaded']) + omit_ways(['profasm','profthreaded']) ], compile_and_run, ['']) diff --git a/testsuite/tests/ghc-regress/profiling/should_run/all.T b/testsuite/tests/ghc-regress/profiling/should_run/all.T index 77e34837a8..bcd92ff811 100644 --- a/testsuite/tests/ghc-regress/profiling/should_run/all.T +++ b/testsuite/tests/ghc-regress/profiling/should_run/all.T @@ -10,7 +10,7 @@ test('heapprof001', compile_and_run, ['']) test('2592', - [only_ways(['profasm','profc']), req_profiling, + [only_ways(['profasm']), req_profiling, extra_run_opts('+RTS -M1m -RTS'), exit_code(251)], compile_and_run, ['']) diff --git a/testsuite/tests/ghc-regress/programs/barton-mangler-bug/test.T b/testsuite/tests/ghc-regress/programs/barton-mangler-bug/test.T index 3e9c78e6b0..966b971ae9 100644 --- a/testsuite/tests/ghc-regress/programs/barton-mangler-bug/test.T +++ b/testsuite/tests/ghc-regress/programs/barton-mangler-bug/test.T @@ -9,8 +9,6 @@ test('barton-mangler-bug', 'Plot.hi', 'Plot.o', 'PlotExample.hi', 'PlotExample.o', 'TypesettingTricks.hi', 'TypesettingTricks.o']), - # omit via-C ways, gcc takes too long: - omit_ways(['profc','optc']), omit_compiler_types(['hugs'])], multimod_compile_and_run, ['Main', '']) diff --git a/testsuite/tests/ghc-regress/quasiquotation/qq005/test.T b/testsuite/tests/ghc-regress/quasiquotation/qq005/test.T index 46c5a5c976..52671ef838 100644 --- a/testsuite/tests/ghc-regress/quasiquotation/qq005/test.T +++ b/testsuite/tests/ghc-regress/quasiquotation/qq005/test.T @@ -5,7 +5,7 @@ test('qq005', # 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 - omit_ways(['profc','profasm','profthreaded']), + omit_ways(['profasm','profthreaded']), extra_clean(['Expr.hi', 'Expr.o', 'Main.hi', 'Main.o'])], multimod_compile_and_run, ['Main', '']) diff --git a/testsuite/tests/ghc-regress/quasiquotation/qq007/test.T b/testsuite/tests/ghc-regress/quasiquotation/qq007/test.T index 64490061ac..6b7ef6dcd7 100644 --- a/testsuite/tests/ghc-regress/quasiquotation/qq007/test.T +++ b/testsuite/tests/ghc-regress/quasiquotation/qq007/test.T @@ -4,7 +4,7 @@ test('qq007', # 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 - omit_ways(['profc','profasm','profthreaded']), + omit_ways(['profasm','profthreaded']), only_compiler_types(['ghc'])], multimod_compile, ['Test', '-v0']) diff --git a/testsuite/tests/ghc-regress/quasiquotation/qq008/test.T b/testsuite/tests/ghc-regress/quasiquotation/qq008/test.T index 8643373dd2..02b88dbd0a 100644 --- a/testsuite/tests/ghc-regress/quasiquotation/qq008/test.T +++ b/testsuite/tests/ghc-regress/quasiquotation/qq008/test.T @@ -4,7 +4,7 @@ test('qq008', # 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 - omit_ways(['profc','profasm','profthreaded']), + omit_ways(['profasm','profthreaded']), only_compiler_types(['ghc'])], multimod_compile, ['Test', '-v0']) diff --git a/testsuite/tests/ghc-regress/rename/should_compile/all.T b/testsuite/tests/ghc-regress/rename/should_compile/all.T index 193a459bae..42f8fd58a6 100644 --- a/testsuite/tests/ghc-regress/rename/should_compile/all.T +++ b/testsuite/tests/ghc-regress/rename/should_compile/all.T @@ -65,10 +65,10 @@ test('rn044', extra_clean(['Rn044_A.hi', 'Rn044_A.o', 'Rn044_B.hi', 'Rn044_B.o']), multimod_compile, ['rn044', '-v0']) test('rn045', normal, compile, ['']) -test('rn046', omit_ways(['optc', 'profc']), compile, ['-W']) -test('rn047', omit_ways(['optc', 'profc']), compile, ['-W']) -test('rn048', omit_ways(['optc', 'profc']), compile, ['-W']) -test('rn049', omit_ways(['optc', 'profc']), compile, ['-W']) +test('rn046', normal, compile, ['-W']) +test('rn047', normal, compile, ['-W']) +test('rn048', normal, compile, ['-W']) +test('rn049', normal, compile, ['-W']) test('rn050', extra_clean(['Rn050_A.hi', 'Rn050_A.o']), @@ -119,7 +119,7 @@ test('T2914', normal, compile, ['']) test('T3221', normal, compile, ['']) test('T3262', normal, compile, ['']) test('T3371', normal, compile, ['']) -test('T1074b', omit_ways(['optc', 'profc']), compile, ['-Wall']) +test('T1074b', normal, compile, ['-Wall']) test('T3640', normal, compile, ['']) test('T3901', normal, compile, ['']) test('T1954', normal, compile, ['']) diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/all.T b/testsuite/tests/ghc-regress/simplCore/should_compile/all.T index 3bc1999942..503847141e 100644 --- a/testsuite/tests/ghc-regress/simplCore/should_compile/all.T +++ b/testsuite/tests/ghc-regress/simplCore/should_compile/all.T @@ -15,7 +15,7 @@ test('simpl011', normal, compile, ['']) test('simpl012', normal, compile, ['']) test('simpl013', normal, compile, ['']) test('simpl014', normal, compile, ['']) -test('simpl015', only_ways(['optc','optasm']), compile, ['']) +test('simpl015', only_ways(['optasm']), compile, ['']) test('simpl016', normal, compile, ['']) test('simpl017', normal, compile_fail, ['']) test('simpl018', normal, compile, ['']) @@ -34,7 +34,7 @@ test('spec002', normal, compile, ['']) test('spec003', normal, compile, ['']) test('rule1', normal, compile, ['']) -test('rule2', only_ways(['optc','optasm']), compile, ['-dsuppress-uniques']) +test('rule2', only_ways(['optasm']), compile, ['-dsuppress-uniques']) test('dfun-loop', normal, compile, ['']) test('strict-float', normal, compile, ['']) @@ -43,28 +43,28 @@ test('T4203', normal, compile, ['']) # With -prof -fvia-C, this test makes gcc go out to lunch, and the # testsuite driver times out. -test('T3016', [ skip_if_fast, omit_ways(['optc','profc']) ], compile, ['']) +test('T3016', skip_if_fast, compile, ['']) test('T1647', normal, compile, ['-fdicts-strict -dcore-lint']) test('T3234', - only_ways(['optc','optasm']), + only_ways(['optasm']), compile, ['-ddump-simpl-stats -dsuppress-uniques']) -test('T3717', only_ways(['optc','optasm']), +test('T3717', only_ways(['optasm']), compile, ['-ddump-simpl -dsuppress-uniques']) -test('spec-inline', only_ways(['optc','optasm']), +test('spec-inline', only_ways(['optasm']), compile, ['-O2 -ddump-simpl -dsuppress-uniques']) -test('T4908', only_ways(['optc','optasm']), +test('T4908', only_ways(['optasm']), compile, ['-O2 -ddump-simpl -dsuppress-uniques']) test('T4930', [if_compiler_lt('ghc', '7.1', expect_fail), - only_ways(['optc','optasm'])], + only_ways(['optasm'])], compile, ['-O -ddump-simpl -dsuppress-uniques']) @@ -84,7 +84,7 @@ test('T4201', ['$MAKE -s --no-print-directory T4201']) test('T3772', -# only_ways(['optc','optasm']), +# only_ways(['optasm']), extra_clean(['T3772_A.hi', 'T3772_A.o']), run_command, ['$MAKE -s --no-print-directory T3772']) diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/all.T b/testsuite/tests/ghc-regress/simplCore/should_run/all.T index 216fd21cbc..82b1c59244 100644 --- a/testsuite/tests/ghc-regress/simplCore/should_run/all.T +++ b/testsuite/tests/ghc-regress/simplCore/should_run/all.T @@ -5,7 +5,7 @@ # Only compile with optimisation def f( opts ): - opts.only_ways = ['optc','optasm'] + opts.only_ways = ['optasm'] setTestOpts(f) @@ -32,15 +32,15 @@ test('T2486', normal, compile, ['']) test('T2756', normal, compile_and_run, ['']) test('T3437', extra_run_opts('+RTS -M10m'), compile_and_run, ['']) -test('SeqRule', only_ways(['optc','optasm']), compile_and_run, ['']) +test('SeqRule', only_ways(['optasm']), compile_and_run, ['']) test('T3403', normal, compile_and_run, ['-package containers']) test('T3591', normal, compile_and_run, ['']) test('T4814', normal, compile_and_run, ['']) # Run this test *without* optimisation too -test('T3959', only_ways(['normal','optc','optasm']), compile_and_run, ['']) -test('T3983', [only_ways(['normal','optc','optasm']), +test('T3959', only_ways(['normal','optasm']), compile_and_run, ['']) +test('T3983', [only_ways(['normal','optasm']), extra_clean(['T3983_Foo.hi','T3983_Foo.o','T3983_Bar.hi','T3983_Bar.o',])], multimod_compile_and_run, ['T3983','']) diff --git a/testsuite/tests/ghc-regress/stranal/should_compile/all.T b/testsuite/tests/ghc-regress/stranal/should_compile/all.T index af1bee3049..5814f39f7d 100644 --- a/testsuite/tests/ghc-regress/stranal/should_compile/all.T +++ b/testsuite/tests/ghc-regress/stranal/should_compile/all.T @@ -1,5 +1,5 @@ # Only compile with optimisation -setTestOpts( only_ways(['optc','optasm']) ) +setTestOpts( only_ways(['optasm']) ) test('default', normal, compile, ['']) test('fact', normal, compile, ['']) diff --git a/testsuite/tests/ghc-regress/stranal/should_run/all.T b/testsuite/tests/ghc-regress/stranal/should_run/all.T index f02d0d9651..d94a7c492d 100644 --- a/testsuite/tests/ghc-regress/stranal/should_run/all.T +++ b/testsuite/tests/ghc-regress/stranal/should_run/all.T @@ -1,5 +1,5 @@ # Optimised only, we're testing the strictness analyser here -setTestOpts( only_ways(['optc','optasm']) ) +setTestOpts( only_ways(['optasm']) ) test('strun001', normal, compile_and_run, ['']) test('strun002', exit_code(1), compile_and_run, ['']) diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/all.T b/testsuite/tests/ghc-regress/typecheck/should_compile/all.T index 30848e894d..467d0d0e9d 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_compile/all.T +++ b/testsuite/tests/ghc-regress/typecheck/should_compile/all.T @@ -304,7 +304,7 @@ test('T3342', normal, compile, ['']) test('T3346', normal, compile, ['']) # This is a TH test, which would require extra magic to make it work with # profiling (see th/all.T). -test('T3391', [omit_ways(['profc','profasm']), if_compiler_profiled(skip)], +test('T3391', [omit_ways(['profasm']), if_compiler_profiled(skip)], compile, ['']) test('T3409', normal, compile, ['']) test('T3955', normal, compile, ['']) |