Commit cbce68ba authored by Ian Lynagh's avatar Ian Lynagh
Browse files

More cleanup fixes

parent 9d484f72
......@@ -29,7 +29,7 @@ test('ghcpkg04',
test('pkg01', normal, compile, [''])
test('1750',
extra_clean(['1750.hs',
extra_clean(['1750.hs', '1750.out',
'local1750.package.conf',
'local1750.package.conf.old']),
run_command, ['$MAKE -s --no-print-directory 1750'])
......
test('1959',
extra_clean(['E.hs', 'prog']),
extra_clean(['E.hi', 'E.o', 'E.hs', 'prog', 'compile.out',
'B.hi', 'B.o', 'C.hi', 'C.o', 'D.hi', 'D.o']),
run_command,
['$MAKE -s --no-print-directory dotest'])
......@@ -52,7 +52,7 @@ test('driver023', normal, run_command,
['$MAKE -s --no-print-directory test023'])
cleanall()
test('driver024',
extra_clean(['obj024/B/C024.o', 'obj024/B', 'obj024']),
extra_clean(['B/C024.hi', 'obj024/B/C024.o', 'obj024/B', 'obj024']),
run_command,
['$MAKE -s --no-print-directory test024'])
test('driver024a', normal, run_command,
......
......@@ -27,16 +27,16 @@ test('Simple23', normal, compile, [''])
test('ind1', normal, compile, [''])
test('ind2',
extra_clean(['Ind2_help.hi', 'Ind2_help.o', 'Exp.hi', 'Imp.o']),
extra_clean(['Ind2_help.hi', 'Ind2_help.o']),
multimod_compile,
['ind2', '-v0'])
test('impexp',
extra_clean(['Ind2_help.hi', 'Ind2_help.o', 'Exp.hi', 'Imp.o']),
extra_clean(['Exp.hi', 'Exp.o', 'Imp.hi', 'Imp.o']),
multimod_compile,
['Imp', '-w -no-hs-main -c'])
test('ATLoop',
extra_clean(['ATLoop_Help.o','ATLoop_Help.hi']),
extra_clean(['ATLoop_help.o','ATLoop_help.hi']),
multimod_compile,
['ATLoop','-v0'])
......
......@@ -5,25 +5,29 @@ test('rn005', normal, compile, [''])
test('rn006', normal, compile, [''])
test('rn009',
[only_compiler_types(['ghc']),
extra_clean(['Imp10Aux.hi', 'Imp10Aux.o'])],
extra_clean(['Imp10Aux.hi', 'Imp10Aux.o',
'Imp10Aux.hi-boot', 'Imp10Aux.o-boot'])],
multimod_compile,
['rn009', '-v0'])
# rn10 tests the same things as 009,011,012
#test('rn010', only_compiler_types(['ghc']), multimod_compile, ['rn010', '-v0'])
test('rn011',
[only_compiler_types(['ghc']),
extra_clean(['Imp100Aux.hi', 'Imp100Aux.o'])],
extra_clean(['Imp100Aux.hi', 'Imp100Aux.o',
'Imp100Aux.hi-boot', 'Imp100Aux.o-boot'])],
multimod_compile,
['rn011', '-v0'])
test('rn012',
[only_compiler_types(['ghc']),
extra_clean(['Imp500Aux.hi', 'Imp500Aux.o'])],
extra_clean(['Imp500Aux.hi', 'Imp500Aux.o',
'Imp500Aux.hi-boot', 'Imp500Aux.o-boot'])],
multimod_compile,
['rn012', '-v0'])
test('rn013', normal, compile, [''])
test('rn017',
[only_compiler_types(['ghc']),
extra_clean(['RnAux017.hi', 'RnAux017.o'])],
extra_clean(['RnAux017.hi', 'RnAux017.o',
'RnAux017.hi-boot', 'RnAux017.o-boot'])],
multimod_compile,
['rn017', '-v0'])
test('rn019', normal, compile, [''])
......@@ -94,7 +98,11 @@ test('rn061', normal, compile, [''])
test('rn062', normal, compile, [''])
test('rn063', if_compiler_lt('ghc', '6.9', expect_fail), compile, [''])
test('rn064', normal, compile, [''])
test('rn065', if_compiler_lt('ghc', '6.9', expect_fail), multimod_compile, ['rn065', '-v0'])
test('rn065',
[if_compiler_lt('ghc', '6.9', expect_fail),
extra_clean(['Rn065A.hi', 'Rn065A.o'])],
multimod_compile,
['rn065', '-v0'])
test('T1972', if_compiler_lt('ghc', '6.9', expect_fail), compile, [''])
test('T2205', normal, compile, [''])
......
......@@ -49,7 +49,10 @@ test('rnfail043', skip_if_no_ghci, compile_fail, ['-v0'])
test('rnfail044', normal, compile_fail, [''])
test('rnfail045', normal, compile_fail, [''])
test('rnfail046', normal, compile_fail, [''])
test('rnfail047', normal, multimod_compile_fail, ['rnfail047', '-v0'])
test('rnfail047',
extra_clean(['RnFail047_A.hi-boot', 'RnFail047_A.o-boot']),
multimod_compile_fail,
['rnfail047', '-v0'])
test('rnfail048', normal, compile_fail, [''])
test('rnfail049', if_compiler_lt('ghc', '6.9', skip), compile_fail, [''])
test('rnfail050', if_compiler_lt('ghc', '6.9', skip), compile_fail, [''])
......@@ -57,7 +60,12 @@ test('rnfail051', if_compiler_lt('ghc', '6.9', skip), compile_fail, [''])
test('rnfail052', normal, compile_fail, [''])
test('rnfail053', normal, compile_fail, [''])
test('rnfail054', normal, compile_fail, [''])
test('rnfail055', if_compiler_lt('ghc', '6.9', skip), multimod_compile_fail, ['RnFail055','-v0'])
test('rnfail055',
[if_compiler_lt('ghc', '6.9', skip),
extra_clean(['RnFail055.hi-boot', 'RnFail055.o-boot',
'RnFail055_aux.hi', 'RnFail055_aux.o'])],
multimod_compile_fail,
['RnFail055','-v0'])
test('rn_dup', normal, compile_fail, [''])
test('T2310', if_compiler_lt('ghc', '6.9', expect_fail), compile_fail, [''])
......
Supports Markdown
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