Commit 2ce702ee authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Get rid of the multisrc* test types

They added too much complexity for their very few uses.
Fixes:
    framework failure for tc251(runTest) Unhandled exception:
    too many values to unpack
parent f2f3b142
......@@ -540,7 +540,7 @@ def test_common_work (name, opts, func, args):
# All the ways we might run this test
if func == compile or func == multimod_compile:
all_ways = config.compile_ways
elif func == compile_and_run or func == multimod_compile_and_run or func == multisrc_compile_and_run:
elif func == compile_and_run or func == multimod_compile_and_run:
all_ways = config.run_ways
elif func == ghci_script:
if 'ghci' in config.run_ways:
......@@ -594,8 +594,7 @@ def test_common_work (name, opts, func, args):
'_stub.h', '_stub.c', '_stub.o',
'.hp', '.exe.hp', '.ps', '.aux', '.hcr', '.eventlog']))
if func == multisrc_compile or func == multisrc_compile_fail \
or func == multi_compile or func == multi_compile_fail:
if func == multi_compile or func == multi_compile_fail:
extra_mods = args[1]
clean(map (lambda (f,x): replace_suffix(f, 'o'), extra_mods))
clean(map (lambda (f,x): replace_suffix(f, 'hi'), extra_mods))
......@@ -826,14 +825,6 @@ def multimod_compile( name, way, top_mod, extra_hc_opts ):
def multimod_compile_fail( name, way, top_mod, extra_hc_opts ):
return do_compile( name, way, 1, top_mod, [], extra_hc_opts )
def multisrc_compile( name, way, top_mod, extra_mods, extra_hc_opts ):
extra_mods = map ((lambda y : (y, '')), extra_mods)
return do_compile( name, way, 0, top_mod, extra_mods, extra_hc_opts)
def multisrc_compile_fail( name, way, top_mod, extra_mods, extra_hc_opts ):
extra_mods = map ((lambda y : (y, '')), extra_mods)
return do_compile( name, way, 1, top_mod, extra_mods, extra_hc_opts)
def multi_compile( name, way, top_mod, extra_mods, extra_hc_opts ):
return do_compile( name, way, 0, top_mod, extra_mods, extra_hc_opts)
......@@ -914,10 +905,6 @@ def compile_and_run( name, way, extra_hc_opts ):
def multimod_compile_and_run( name, way, top_mod, extra_hc_opts ):
return compile_and_run__( name, way, top_mod, [], extra_hc_opts)
def multisrc_compile_and_run( name, way, top_mod, extra_mods, extra_hc_opts ):
extra_mods = map ((lambda y : (y, '')), extra_mods)
return compile_and_run__( name, way, top_mod, extra_mods, extra_hc_opts)
def multi_compile_and_run( name, way, top_mod, extra_mods, extra_hc_opts ):
return compile_and_run__( name, way, top_mod, extra_mods, extra_hc_opts)
......
......@@ -72,8 +72,8 @@ test('cgrun066', normal, compile_and_run, [''])
test('cgrun067', extra_clean(['Cgrun067A.hi', 'Cgrun067A.o']),
compile_and_run, [''])
test('cgrun068', reqlib('random'), compile_and_run, [''])
test('cgrun069', omit_ways(['ghci']), multisrc_compile_and_run,
['cgrun069', ['cgrun069_cmm.cmm'], ''])
test('cgrun069', omit_ways(['ghci']), multi_compile_and_run,
['cgrun069', [('cgrun069_cmm.cmm', '')], ''])
test('cgrun070', normal, compile_and_run, [''])
test('cgrun071', normal, compile_and_run, [''])
......@@ -85,6 +85,6 @@ test('3207', normal, compile_and_run, [''])
test('3561', normal, compile_and_run, [''])
test('3677', extra_run_opts('+RTS -K8k -RTS'), compile_and_run, [''])
test('4441', normal, compile_and_run, [''])
test('5149', omit_ways(['ghci']), multisrc_compile_and_run,
['5149', ['5149_cmm.cmm'], ''])
test('5149', omit_ways(['ghci']), multi_compile_and_run,
['5149', [('5149_cmm.cmm', '')], ''])
test('5129', normal, compile_and_run, [''])
......@@ -342,7 +342,7 @@ test('mc18', normal, compile, [''])
test('tc249', normal, compile, [''])
test('tc250', normal, compile, [''])
test('tc251', extra_clean(['Tc251_Help.hi', 'Tc251_Help.o']),
multisrc_compile, ['tc251', ['Tc251_Help.hs'], '-v0'])
multi_compile, ['tc251', [('Tc251_Help.hs', '')], '-v0'])
test('tc252', normal, compile, [''])
test('tc253', normal, compile, [''])
test('tc254', 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