From f0cd5ace244d3e70aee3216f2d56f4a2e2e7d162 Mon Sep 17 00:00:00 2001 From: simonpj Date: Fri, 21 Dec 2007 09:01:51 +0000 Subject: [PATCH] Replace mentions of way 'opt' by the new 'optc' (often adding optasm too) Its really a testsuite-framework bug that these mentions of 'opt' have lingered so long. They should have been rejected as a non-existent way. --- testsuite/tests/ghc-regress/codeGen/should_compile/all.T | 4 ++-- testsuite/tests/ghc-regress/codeGen/should_run/all.T | 2 +- testsuite/tests/ghc-regress/cpranal/should_compile/all.T | 2 +- testsuite/tests/ghc-regress/haddock/haddock_examples/test.T | 2 +- .../tests/ghc-regress/indexed-types/should_compile/all.T | 2 +- testsuite/tests/ghc-regress/indexed-types/should_fail/all.T | 2 +- testsuite/tests/ghc-regress/lib/Generics/all.T | 2 +- testsuite/tests/ghc-regress/simplCore/should_compile/all.T | 2 +- testsuite/tests/ghc-regress/stranal/should_compile/all.T | 2 +- testsuite/tests/ghc-regress/stranal/should_run/all.T | 2 +- testsuite/tests/ghc-regress/typecheck/should_compile/all.T | 4 ++-- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/testsuite/tests/ghc-regress/codeGen/should_compile/all.T b/testsuite/tests/ghc-regress/codeGen/should_compile/all.T index d9535d27bb..9e254346cf 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(['opt']), compile, ['-fvia-C']) +test('cg003', only_ways(['optc','optasm']), compile, ['-fvia-C']) test('cg004', normal, compile, ['']) -test('cg005', only_ways(['opt']), compile, ['']) +test('cg005', only_ways(['optc','optasm']), compile, ['']) test('cg006', normal, compile, ['']) test('1916', 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 84b910d2a6..af98bc64f3 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('cg049', normal, compile_and_run, ['-funbox-strict-fields']) test('cg050', normal, compile_and_run, ['']) # Doesn't work with External Core due to datatype declaration with no constructors test('cg051', (compose (expect_fail_for(['extcore','optextcore']),exit_code(1))), compile_and_run, ['']) -test('cg052', only_ways(['opt']), compile_and_run, ['-funbox-strict-fields']) +test('cg052', only_ways(['optc','optasm']), compile_and_run, ['-funbox-strict-fields']) test('cg053', normal, compile_and_run, ['']) test('cg054', normal, compile_and_run, ['']) test('cg055', 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 69598c7182..f996d242c9 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 = ['opt'] + opts.only_ways = ['optc','optasm'] setTestOpts(f) diff --git a/testsuite/tests/ghc-regress/haddock/haddock_examples/test.T b/testsuite/tests/ghc-regress/haddock/haddock_examples/test.T index 195208a9ac..be473850b8 100644 --- a/testsuite/tests/ghc-regress/haddock/haddock_examples/test.T +++ b/testsuite/tests/ghc-regress/haddock/haddock_examples/test.T @@ -1,2 +1,2 @@ -test('haddock.Test', compose(omit_ways(['opt', 'optasm', 'profasm']), normal), multimod_compile, ['Test Hidden Visible', '-fglasgow-exts -haddock -ddump-parsed']) +test('haddock.Test', compose(omit_ways(['optc', 'optasm', 'profasm']), normal), multimod_compile, ['Test Hidden Visible', '-fglasgow-exts -haddock -ddump-parsed']) clean(['Test.hi', 'Test.o', 'Hidden.hi', 'Hidden.o', 'Visible.hi', 'Visible.o']) diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/all.T b/testsuite/tests/ghc-regress/indexed-types/should_compile/all.T index edcb941a96..2c069434aa 100644 --- a/testsuite/tests/ghc-regress/indexed-types/should_compile/all.T +++ b/testsuite/tests/ghc-regress/indexed-types/should_compile/all.T @@ -1,5 +1,5 @@ setTestOpts(only_compiler_types(['ghc'])) -setTestOpts(omit_ways(['opt', 'optasm', 'hpc'])) +setTestOpts(omit_ways(['optc', 'optasm', 'hpc'])) test('Simple1', normal, compile, ['']) test('Simple2', normal, 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 78f4df50f0..0741aadeba 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(['opt', 'optasm'])) +setTestOpts(omit_ways(['optc', 'optasm'])) test('Simple1a', normal, compile_fail, ['']) test('Simple1b', normal, compile_fail, ['']) diff --git a/testsuite/tests/ghc-regress/lib/Generics/all.T b/testsuite/tests/ghc-regress/lib/Generics/all.T index 228af73ade..a4452efbfb 100644 --- a/testsuite/tests/ghc-regress/lib/Generics/all.T +++ b/testsuite/tests/ghc-regress/lib/Generics/all.T @@ -2,7 +2,7 @@ setTestOpts(only_compiler_types(['ghc'])) test('newtype', normal, compile_and_run, ['']) test('datatype', normal, compile_and_run, ['-package containers']) -test('encode', omit_ways(['opt','optasm']), compile, ['']) +test('encode', omit_ways(['optc','optasm']), compile, ['']) test('ext', normal, compile, ['']) test('getC', normal, compile_and_run, ['']) test('where', normal, compile_and_run, ['']) diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/all.T b/testsuite/tests/ghc-regress/simplCore/should_compile/all.T index 06327f1450..49085c99b9 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(['opt']), compile, ['']) +test('simpl015', only_ways(['optc','optasm']), compile, ['']) test('simpl016', normal, compile, ['']) test('simpl017', normal, compile, ['']) test('simpl018', normal, compile, ['']) diff --git a/testsuite/tests/ghc-regress/stranal/should_compile/all.T b/testsuite/tests/ghc-regress/stranal/should_compile/all.T index 52e5de5d6c..b9a8293d9d 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(['opt']) ) +setTestOpts( only_ways(['optc','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 dabb211683..1117983537 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(['opt']) ) +setTestOpts( only_ways(['optc','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 77488880d7..6c5dab4973 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_compile/all.T +++ b/testsuite/tests/ghc-regress/typecheck/should_compile/all.T @@ -175,8 +175,8 @@ test('tc169', normal, compile, ['']) # which we do by steam here, with a pair of tests. Make sure # we run one way only, so we can be sure to have the right kind # of interface file for the second part of the test. -test('Tc170_Aux', compose(no_clean, only_ways(['opt'])), compile, ['']) -test('tc170', only_ways(['opt']), compile, ['']) +test('Tc170_Aux', compose(no_clean, only_ways(['optc','optasm'])), compile, ['']) +test('tc170', only_ways(['optc','optasm']), compile, ['']) clean(['Tc170_Aux.comp.stderr', 'Tc170_Aux.hi', 'Tc170_Aux.o']) test('tc171', normal, compile, ['']) -- GitLab