Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Makefile: fix occasional race where we fail to compile tools/tests. #2962

Merged
merged 1 commit into from
Aug 17, 2019
Merged

Makefile: fix occasional race where we fail to compile tools/tests. #2962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,7 @@ clean: wire-clean
$(RM) gen_*.h ccan/tools/configurator/configurator
$(RM) ccan/ccan/cdump/tools/cdump-enumstr.o
$(RM) check-bolt tools/check-bolt tools/*.o
$(RM) tools/headerversions
find . -name '*gcda' -delete
find . -name '*gcno' -delete
find . -name '*.nccout' -delete
Expand Down
29 changes: 15 additions & 14 deletions tools/test/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,34 +9,34 @@ check-units: check-tools

TOOL_TEST_INCL_SRC := tools/test/enum.c
TOOL_GEN_SRC := tools/test/gen_test.c tools/test/gen_print.c
TOOL_GEN_OBJS := $(TOOL_GEN_SRC:.c=.o)
TOOL_GEN_HEADER := tools/test/gen_test.h tools/test/gen_print.h
TOOL_TEST_SRC := $(wildcard tools/test/run-*.c)
TOOL_TEST_OBJS := $(TOOL_TEST_SRC:.c=.o)
TOOL_TEST_PROGRAMS := $(TOOL_TEST_OBJS:.o=)

TOOL_TEST_COMMON_OBJS := \
common/utils.o \
tools/test/enum.o
common/utils.o

TOOLS_WIRE_DEPS := $(BOLT_DEPS) tools/test/test_cases $(wildcard tools/gen/*_template)

$(TOOL_TEST_SRC) $(TOOL_GEN_SRC): $(TOOL_GEN_HEADER)
$(TOOL_TEST_OBJS): $(TOOL_GEN_SRC)
$(TOOL_TEST_PROGRAMS): $(TOOL_TEST_COMMON_OBJS) $(TOOL_GEN_SRC:.c=.o)
$(TOOL_GEN_SRC) $(TOOL_GEN_HEADER): $(TOOLS_WIRE_DEPS)
$(TOOL_GEN_SRC:.c=.o): $(TOOL_TEST_INCL_SRC:.c=.o)
$(TOOL_TEST_OBJS) $(TOOL_GEN_OBJS): $(TOOL_GEN_HEADER)
$(TOOL_TEST_PROGRAMS): $(TOOL_TEST_COMMON_OBJS) $(TOOL_GEN_SRC:.c=.o) tools/test/enum.o

tools/test/gen_test.h:
tools/test/gen_test.h: $(TOOLS_WIRE_DEPS)
$(BOLT_GEN) --page header $@ test_type < tools/test/test_cases > $@

tools/test/gen_test.c:
$(BOLT_GEN) --page impl ${@:.c=.h} test_type < tools/test/test_cases > $@
@MAKE=$(MAKE) tools/update-mocks.sh "$@"
# Parallel make sometimes tries to use file before update-mocks, so split.
tools/test/gen_test.c.tmp.c: $(TOOLS_WIRE_DEPS)
$(BOLT_GEN) --page impl tools/test/gen_test.h test_type < tools/test/test_cases > $@

tools/test/gen_print.h: wire/gen_onion_wire.h
tools/test/gen_test.c: tools/test/gen_test.c.tmp.c
@MAKE=$(MAKE) tools/update-mocks.sh "$<" && mv "$<" "$@"

tools/test/gen_print.h: wire/gen_onion_wire.h $(TOOLS_WIRE_DEPS)
$(BOLT_GEN) -P --page header $@ test_type < tools/test/test_cases > $@

tools/test/gen_print.c:
tools/test/gen_print.c: $(TOOLS_WIRE_DEPS)
echo '#include "gen_test.h"' > $@
$(BOLT_GEN) -P --page impl ${@:.c=.h} test_type < tools/test/test_cases >> $@

Expand All @@ -52,4 +52,5 @@ tools-update-mocks: $(TOOL_TEST_SRC:%=update-mocks/%)
clean: tools-test-clean

tools-test-clean:
$(RM) $(TOOL_GEN_HEADER) $(TOOL_GEN_SRC) $(TOOL_TEST_OBJS)
$(RM) $(TOOL_GEN_HEADER) $(TOOL_GEN_SRC) $(TOOL_TEST_OBJS) $(TOOL_TEST_PROGRAMS)
$(RM) $(TOOL_GEN_SRC:.c=.o) tools/test/enum.o