Commit f0cd5ace authored by Simon Peyton Jones's avatar Simon Peyton Jones

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.
parent 33b21f55
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, [''])
......@@ -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, [''])
......
# Just do the opt way...
def f( opts ):
opts.only_ways = ['opt']
opts.only_ways = ['optc','optasm']
setTestOpts(f)
......
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'])
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, [''])
......
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, [''])
......
......@@ -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, [''])
......
......@@ -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, [''])
......
# Only compile with optimisation
setTestOpts( only_ways(['opt']) )
setTestOpts( only_ways(['optc','optasm']) )
test('default', normal, compile, [''])
test('fact', normal, compile, [''])
......
# 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, [''])
......
......@@ -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, [''])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment