Skip to content

Commit 9861776

Browse files
committed
Merge branch 'pmderodat/minor' into 'master'
Minor reformattings See merge request eng/cov/gnatcoverage!242 Following changes for eng/cov/gnatcoverage#69
2 parents 2bee2eb + b5bda0e commit 9861776

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

tools/gnatcov/Makefile

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -168,32 +168,32 @@ bin:
168168
fi
169169

170170
ifdef INSTRUMENTED
171-
# We need to instrument and build at the same time: the driver and gnatcov32
172-
# builds share the same object directory, meaning that gnatcov will remove
173-
# files resulting from the instrumentation of gnatcov32 when instrumenting
174-
# the driver. This will be a problem: in the former case,
175-
# gnatcov_bits_specific.adb is instrumented as a main but not in the latter
176-
# case (gnatcov.adb is). This means that if we use the version that was not
177-
# instrumented as a main to compile gnatcov32, running gnatcov32 will not
178-
# dump execution traces.
171+
# We need to instrument and build at the same time: the driver and
172+
# gnatcov32 builds share the same object directory, meaning that
173+
# gnatcov will remove files resulting from the instrumentation of
174+
# gnatcov32 when instrumenting the driver. This will be a problem: in
175+
# the former case, gnatcov_bits_specific.adb is instrumented as a main
176+
# but not in the latter case (gnatcov.adb is). This means that if we
177+
# use the version that was not instrumented as a main to compile
178+
# gnatcov32, running gnatcov32 will not dump execution traces.
179179

180180
gnatcov instrument -j0 -P gnatcov.gpr -XPART=gnatcov64
181181
$(GPRBUILD) $(BIN_COMMON_BUILD_ARGS) -XPART=gnatcov64 \
182-
--src-subdirs=gnatcov-instr
182+
--src-subdirs=gnatcov-instr
183183

184184
gnatcov instrument -j0 -P gnatcov.gpr -XPART=gnatcov32
185185
$(GPRBUILD) $(BIN_COMMON_BUILD_ARGS) -XPART=gnatcov32 \
186-
--src-subdirs=gnatcov-instr
186+
--src-subdirs=gnatcov-instr
187187

188188
gnatcov instrument -j0 -P gnatcov.gpr -XPART=driver
189189
$(GPRBUILD) $(BIN_COMMON_BUILD_ARGS) -XPART=driver \
190-
--src-subdirs=gnatcov-instr
190+
--src-subdirs=gnatcov-instr
191191

192192
gnatcov instrument -j0 -P gnatcov.gpr -XPART=compiler
193193
$(GPRBUILD) $(BIN_COMMON_BUILD_ARGS) -XPART=compiler \
194-
--src-subdirs=gnatcov-instr
194+
--src-subdirs=gnatcov-instr
195195
else
196-
# Start with the 64-bit gnatcov, which has the largest closure
196+
# Start with the 64-bit gnatcov, which has the largest closure
197197
$(GPRBUILD) $(BIN_COMMON_BUILD_ARGS) -XPART=gnatcov64
198198
$(GPRBUILD) $(BIN_COMMON_BUILD_ARGS) -XPART=gnatcov32
199199
$(GPRBUILD) $(BIN_COMMON_BUILD_ARGS) -XPART=driver
@@ -257,7 +257,7 @@ install-bin:
257257
$(CP) \
258258
$(PGM32PATH)$(exeext) \
259259
$(PGM64PATH)$(exeext) \
260-
$(COMPILERPATH)$(exeext) \
260+
$(COMPILERPATH)$(exeext) \
261261
$(PREFIX)/libexec/gnatcoverage
262262

263263
install-examples:

tools/gnatcov/gnatcov.gpr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ project Gnatcov is
6464

6565
case Part is
6666
when "gnatcov64" | "compiler" => null;
67-
when others => C_Support := "False";
67+
when others => C_Support := "False";
6868
end case;
6969

7070
type Build_Mode_Type is ("dev", "prod", "boot");

0 commit comments

Comments
 (0)