Skip to content

Commit

Permalink
Merge branch 'leo/166_int_mk_prj' into 'master'
Browse files Browse the repository at this point in the history
Test: Do not pass --projects to gnatcov in the integration Makefile

Closes #166

See merge request eng/ide/libadalang-tools!204
leocreuse committed Apr 19, 2024
2 parents 2ee2dbc + f31229a commit ff9e580
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions src/test-harness.adb
Original file line number Diff line number Diff line change
@@ -4031,8 +4031,7 @@ package body Test.Harness is
(0,
ASCII.HT
& "$(GNATCOV) run -P$*.gpr $(SWITCHES_RUN) $(GPRFLAGS)"
& " -o $*-gnattest.trace --projects="
& Source_Project_Tree.Root_Project.Name);
& " -o $*-gnattest.trace");
if Stub_Mode_ON or else Separate_Drivers then
S_Put (0, " --units=@$(dir $*)units.list");
end if;
@@ -4050,7 +4049,6 @@ package body Test.Harness is
(0,
ASCII.HT
& "$(GNATCOV) coverage --save-checkpoint=$*-gnattest.ckpt"
& " --projects=" & Source_Project_Tree.Root_Project.Name
& " -P$*.gpr $(GPRFLAGS) $(SWITCHES_COVERAGE) --cancel-annotate"
& " $*-gnattest.trace");
if Separate_Drivers or else Stub_Mode_ON then
@@ -4093,8 +4091,7 @@ package body Test.Harness is
S_Put
(0,
ASCII.HT
& "$(GNATCOV) instrument -P$< $(SWITCHES_INSTRUMENT) $(GPRFLAGS)"
& " --projects=" & Source_Project_Tree.Root_Project.Name);
& "$(GNATCOV) instrument -P$< $(SWITCHES_INSTRUMENT) $(GPRFLAGS)");
if Separate_Drivers or else Stub_Mode_ON then
S_Put (0, " --units=@$(dir $*)units.list");
end if;
@@ -4184,7 +4181,6 @@ package body Test.Harness is
ASCII.HT
& "$(GNATCOV) coverage --save-checkpoint=$*-gnattest.ckpt"
& " -P$*.gpr $(GPRFLAGS) $(SWITCHES_COVERAGE) --cancel-annotate"
& " --projects=" & Source_Project_Tree.Root_Project.Name
& " $*-gnattest_td.srctrace");
if Separate_Drivers or else Stub_Mode_ON then
S_Put (0, " --units=@$(dir $*)units.list");

0 comments on commit ff9e580

Please sign in to comment.