Commit 6b250468 authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Consistent output for tests

parent 6f76bf1e
......@@ -188,11 +188,11 @@ test('mod142', normal, multimod_compile_fail, ['mod142', '-v0'])
clean(['Mod142_A.hi', 'Mod142_A.o'])
test('mod143', normal, multimod_compile_fail, ['mod143', '-v0'])
clean(['Mod143_A.hi', 'Mod143_A.o'])
test('mod144', compose(normal, exit_code(2)), run_command, ['$MAKE -s --no-print-directory mod144'])
test('mod144', compose(normal, exit_code(2)), run_command, ['$MAKE -s --no-print-directory mod144 MAKELEVEL='])
clean(['Mod143_A.hi', 'Mod143_A.o'])
test('mod145', normal, multimod_compile_fail, ['mod145', '-v0'])
clean(['Mod145_A.hi', 'Mod145_A.o'])
test('mod146', compose(normal, exit_code(2)), run_command, ['$MAKE -s --no-print-directory mod146'])
test('mod146', compose(normal, exit_code(2)), run_command, ['$MAKE -s --no-print-directory mod146 MAKELEVEL='])
clean(['Mod145_A.hi', 'Mod145_A.o'])
test('mod147', normal, multimod_compile_fail, ['mod147', '-v0'])
clean(['Mod147_A.hi', 'Mod147_A.o'])
......@@ -208,13 +208,13 @@ test('mod156', normal, compile, [''])
test('mod157', normal, multimod_compile, ['mod157', '-v0'])
clean(['Mod157_A.hi', 'Mod157_A.o', 'Mod157_B.hi', 'Mod157_B.o',
'Mod157_C.hi', 'Mod157_C.o', 'Mod157_D.hi', 'Mod157_D.o'])
test('mod158', compose(normal, exit_code(2)), run_command, ['$MAKE -s --no-print-directory mod158'])
test('mod158', compose(normal, exit_code(2)), run_command, ['$MAKE -s --no-print-directory mod158 MAKELEVEL='])
clean(['Mod157_A.hi', 'Mod157_A.o', 'Mod157_B.hi', 'Mod157_B.o',
'Mod157_C.hi', 'Mod157_C.o', 'Mod157_D.hi', 'Mod157_D.o'])
test('mod159', normal, multimod_compile, ['mod159', '-v0'])
clean(['Mod159_A.hi', 'Mod159_A.o', 'Mod159_B.hi', 'Mod159_B.o',
'Mod159_C.hi', 'Mod159_C.o', 'Mod159_D.hi', 'Mod159_D.o'])
test('mod160', compose(normal, exit_code(2)), run_command, ['$MAKE -s --no-print-directory mod160'])
test('mod160', compose(normal, exit_code(2)), run_command, ['$MAKE -s --no-print-directory mod160 MAKELEVEL='])
clean(['Mod159_A.hi', 'Mod159_A.o', 'Mod159_B.hi', 'Mod159_B.o',
'Mod159_C.hi', 'Mod159_C.o', 'Mod159_D.hi', 'Mod159_D.o'])
test('mod161', normal, compile_fail, [''])
......@@ -224,11 +224,11 @@ test('mod163', normal, multimod_compile, ['mod163', '-v0'])
clean(['Mod163_A.hi', 'Mod163_A.o'])
test('mod164', normal, multimod_compile_fail, ['mod164', '-v0'])
clean(['Mod164_A.hi', 'Mod164_A.o', 'Mod164_B.hi', 'Mod164_B.o'])
test('mod165', compose(normal, exit_code(2)), run_command, ['$MAKE -s --no-print-directory mod165'])
test('mod165', compose(normal, exit_code(2)), run_command, ['$MAKE -s --no-print-directory mod165 MAKELEVEL='])
clean(['Mod164_A.hi', 'Mod164_A.o', 'Mod164_B.hi', 'Mod164_B.o'])
test('mod166', normal, run_command, ['$MAKE -s --no-print-directory mod166'])
test('mod166', normal, run_command, ['$MAKE -s --no-print-directory mod166 MAKELEVEL='])
clean(['Mod164_A.hi', 'Mod164_A.o', 'Mod164_B.hi', 'Mod164_B.o'])
test('mod167', normal, run_command, ['$MAKE -s --no-print-directory mod167'])
test('mod167', normal, run_command, ['$MAKE -s --no-print-directory mod167 MAKELEVEL='])
clean(['Mod164_A.hi', 'Mod164_A.o', 'Mod164_B.hi', 'Mod164_B.o'])
test('mod168', normal, compile, [''])
test('mod169', normal, compile, [''])
......
mod142.hs:2:20:
Conflicting exports for `x':
`module M' exports `x' defined at mod142.hs:6:0
`module Mod142_A' exports `x' imported from Mod142_A at mod142.hs:4:0-14
(defined at Mod142_A.hs:3:0)
`module M' exports `x' defined at mod142.hs:6:0
mod143.hs:2:20:
Conflicting exports for `Foo':
`module M' exports `Foo' defined at mod143.hs:6:5
`module Mod143_A' exports `Foo' imported from Mod143_A at mod143.hs:4:0-14
(defined at Mod143_A.hs:3:5)
`module M' exports `Foo' defined at mod143.hs:6:5
......@@ -3,4 +3,4 @@ mod144.hs:2:26:
Conflicting exports for `Bar':
`module Mod143_A' exports `Bar' imported from Mod143_A at mod144.hs:4:0-14
`module M' exports `Bar' defined at mod144.hs:6:12
make[1]: *** [mod144] Error 1
make: *** [mod144] Error 1
mod145.hs:2:29:
Conflicting exports for `m1':
`module Mod145' exports `m1' defined at mod145.hs:7:2
`module Mod145_A' exports `m1' imported from Mod145_A at mod145.hs:4:0-14
(defined at Mod145_A.hs:4:2)
`module Mod145' exports `m1' defined at mod145.hs:7:2
......@@ -3,4 +3,4 @@ mod146.hs:2:29:
Conflicting exports for `m1':
`module Mod145_A' exports `m1' imported from Mod145_A at mod146.hs:4:0-14
`module Mod146' exports `m1' defined at mod146.hs:7:2
make[1]: *** [mod146] Error 1
make: *** [mod146] Error 1
mod150.hs:2:19:
Conflicting exports for `id':
`module M' exports `id' defined at mod150.hs:2:41
`module Prelude' exports `id' imported from Prelude
`module M' exports `id' defined at mod150.hs:2:41
mod158.hs:12:4: Not in scope: data constructor `C'
make[1]: *** [mod158] Error 1
make: *** [mod158] Error 1
mod160.hs:12:4: Not in scope: `m3'
make[1]: *** [mod160] Error 1
make: *** [mod160] Error 1
......@@ -3,4 +3,4 @@ mod165.hs:9:4:
Ambiguous occurrence `A.D1'
It could refer to either `D1', imported from Mod164_A at mod165.hs:4:0-19
or `D1', imported from Mod164_B at mod165.hs:5:0-19
make[1]: *** [mod165] Error 1
make: *** [mod165] Error 1
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