mirror of
https://github.com/Mercury-Language/mercury.git
synced 2026-04-17 18:33:58 +00:00
bd7d7db57d
This is to compile them with "mmake -j1", and thus avoid the intermittent
failures caused by interface files of nested submodules not being ready
when another job, executed in parallel by mmake, wants to read them.
tests/invalid_submodules/children.m:
tests/invalid_submodules/children2.m:
tests/invalid_submodules/duplicate_module.m:
tests/invalid_submodules/duplicate_module_test.err_exp:
tests/invalid_submodules/duplicate_module_test.m:
tests/invalid_submodules/exported_unify3.err_exp:
tests/invalid_submodules/exported_unify3.err_exp2:
tests/invalid_submodules/exported_unify3.m:
tests/invalid_submodules/func_class.err_exp:
tests/invalid_submodules/func_class.m:
tests/invalid_submodules/import_in_parent.err_exp:
tests/invalid_submodules/import_in_parent.m:
tests/invalid_submodules/missing_parent_import.err_exp:
tests/invalid_submodules/missing_parent_import.m:
tests/invalid_submodules/nested_impl_in_int.err_exp:
tests/invalid_submodules/nested_impl_in_int.m:
tests/invalid_submodules/sub_a.m:
tests/invalid_submodules/sub_c.err_exp:
tests/invalid_submodules/sub_c.m:
tests/invalid_submodules/undef_mod_qual.err_exp:
tests/invalid_submodules/undef_mod_qual.m:
tests/invalid_submodules/unresolved_overloading.err_exp:
tests/invalid_submodules/unresolved_overloading.m:
Move these files, which contain the source code and expected outputs
of the affected test cases, from the invalid directory to the new
invalid_submodules directory.
tests/invalid/Mercury.options:
tests/invalid/Mmakefile:
Delete any mentions of the moved test cases.
Improve sh programming style in actions.
tests/invalid_submodules/Mercury.options:
tests/invalid_submodules/Mmakefile:
List *only* the moved test cases. Specify the -j1 flag for mmake.
tests/Mmakefile:
tools/bootcheck:
Mention the new test directory.
Request that the list of test directories in these two places be kept
in sync.
Note that the feedback test directory is not yet ready.
117 lines
2.6 KiB
Mathematica
117 lines
2.6 KiB
Mathematica
%---------------------------------------------------------------------------%
|
|
% vim: ts=4 sw=4 et ft=mercury
|
|
%---------------------------------------------------------------------------%
|
|
%
|
|
% Test of modules declared as both nested and separate modules.
|
|
% This is referenced from duplicate_module_test.m.
|
|
|
|
:- module duplicate_module.
|
|
:- interface.
|
|
:- import_module io.
|
|
|
|
:- pred do_main(io__state::di, io__state::uo) is det.
|
|
|
|
:- implementation.
|
|
|
|
%---------------------------------------------------------------------------%
|
|
|
|
:- include_module duplicate_module.child.
|
|
|
|
:- module duplicate_module.child.
|
|
:- interface.
|
|
:- import_module io.
|
|
|
|
:- type foo
|
|
---> bar
|
|
; baz(int).
|
|
|
|
:- pred hello(io__state::di, io__state::uo) is det.
|
|
|
|
:- implementation.
|
|
|
|
hello -->
|
|
io__write_string("duplicate_module.child.hello\n").
|
|
|
|
:- end_module duplicate_module.child.
|
|
|
|
%---------------------------------------------------------------------------%
|
|
|
|
:- include_module child2.
|
|
|
|
:- module duplicate_module.child2.
|
|
:- interface.
|
|
:- import_module io.
|
|
|
|
:- type foo
|
|
---> bar
|
|
; baz(int).
|
|
|
|
:- pred hello(io__state::di, io__state::uo) is det.
|
|
|
|
:- implementation.
|
|
|
|
hello -->
|
|
io__write_string("duplicate_module.child2.hello\n").
|
|
|
|
:- end_module duplicate_module.child2.
|
|
|
|
%---------------------------------------------------------------------------%
|
|
|
|
:- include_module duplicate_module.child3.
|
|
|
|
:- module child3.
|
|
:- interface.
|
|
:- import_module io.
|
|
|
|
:- type foo
|
|
---> bar
|
|
; baz(int).
|
|
|
|
:- pred hello(io__state::di, io__state::uo) is det.
|
|
|
|
:- implementation.
|
|
|
|
hello -->
|
|
io__write_string("duplicate_module.child3.hello\n").
|
|
|
|
:- end_module child3.
|
|
|
|
%---------------------------------------------------------------------------%
|
|
|
|
:- module child4.
|
|
:- interface.
|
|
:- import_module io.
|
|
|
|
:- pred hello(io__state::di, io__state::uo) is det.
|
|
|
|
:- implementation.
|
|
|
|
hello -->
|
|
io__write_string("duplicate_module.child4.hello\n").
|
|
|
|
:- end_module duplicate_module.child4.
|
|
|
|
:- include_module duplicate_module.child4.
|
|
|
|
%---------------------------------------------------------------------------%
|
|
|
|
:- include_module duplicate_module.child5.
|
|
:- include_module duplicate_module.child5.
|
|
|
|
%---------------------------------------------------------------------------%
|
|
|
|
% now we're back in the parent module.
|
|
|
|
:- use_module duplicate_module.child.
|
|
:- use_module duplicate_module.child2.
|
|
:- use_module duplicate_module.child3.
|
|
:- import_module require.
|
|
:- import_module std_util.
|
|
|
|
do_main -->
|
|
duplicate_module.child.hello,
|
|
duplicate_module.child2.hello,
|
|
duplicate_module.child3.hello.
|
|
|
|
:- end_module duplicate_module.
|