update-mocks: make sure we cover all test programs.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2021-05-21 14:47:05 +09:30
parent cc6f1fd120
commit 25b5e1e099
13 changed files with 4 additions and 28 deletions

View File

@ -619,7 +619,10 @@ clean: obsclean
find . -name '*gcno' -delete
find . -name '*.nccout' -delete
update-mocks: $(ALL_GEN_HEADERS)
update-mocks: $(ALL_TEST_PROGRAMS:%=update-mocks/%.c)
$(ALL_TEST_PROGRAMS:%=update-mocks/%.c): $(ALL_GEN_HEADERS) $(EXTERNAL_LIBS) $(CCAN_OBJS) ccan/ccan/cdump/tools/cdump-enumstr config.vars
update-mocks/%: %
@MAKE=$(MAKE) tools/update-mocks.sh "$*" $(SUPPRESS_OUTPUT)

View File

@ -12,6 +12,5 @@ ALL_C_SOURCES += $(BITCOIN_TEST_PROGRAMS:=.c)
# This needs to know what level of optimization we're using.
bitcoin/test/run-secret_eq_consttime.o: CFLAGS += -DCOPTFLAGS="\"${COPTFLAGS}\""
update-mocks: $(BITCOIN_TEST_SRC:%=update-mocks/%)
check-units: $(BITCOIN_TEST_PROGRAMS:%=unittest/%)

View File

@ -22,8 +22,6 @@ CHANNELD_TEST_COMMON_OBJS := \
common/type_to_string.o \
common/utils.o
update-mocks: $(CHANNELD_TEST_SRC:%=update-mocks/%)
$(CHANNELD_TEST_PROGRAMS): $(CCAN_OBJS) $(BITCOIN_OBJS) $(WIRE_OBJS) $(CHANNELD_TEST_COMMON_OBJS)
$(CHANNELD_TEST_OBJS): $(CHANNELD_HEADERS) $(CHANNELD_SRC)

View File

@ -19,8 +19,6 @@ CLI_TEST_COMMON_OBJS := \
common/type_to_string.o \
common/permute_tx.o
update-mocks: $(CLI_TEST_SRC:%=update-mocks/%)
$(CLI_TEST_PROGRAMS): $(CCAN_OBJS) $(BITCOIN_OBJS) $(WIRE_OBJS) $(CLI_TEST_COMMON_OBJS)
$(CLI_TEST_OBJS): $(LIGHTNING_CLI_HEADERS) $(LIGHTNING_CLI_SRC)

View File

@ -33,6 +33,4 @@ common/test/run-json: \
wire/onion$(EXP)_wiregen.o \
wire/towire.o
update-mocks: $(COMMON_TEST_SRC:%=update-mocks/%)
check-units: $(COMMON_TEST_PROGRAMS:%=unittest/%)

View File

@ -14,8 +14,6 @@ CONNECTD_TEST_COMMON_OBJS := \
ALL_C_SOURCES += $(CONNECTD_TEST_SRC)
ALL_TEST_PROGRAMS += $(CONNECTD_TEST_PROGRAMS)
update-mocks: $(CONNECTD_TEST_SRC:%=update-mocks/%)
$(CONNECTD_TEST_PROGRAMS): $(CONNECTD_TEST_COMMON_OBJS) $(BITCOIN_OBJS)
# Test objects depend on ../ src and headers.

View File

@ -26,8 +26,6 @@ GOSSIPD_TEST_COMMON_OBJS := \
ALL_C_SOURCES += $(GOSSIPD_TEST_SRC)
ALL_TEST_PROGRAMS += $(GOSSIPD_TEST_PROGRAMS)
update-mocks: $(GOSSIPD_TEST_SRC:%=update-mocks/%)
$(GOSSIPD_TEST_PROGRAMS): $(GOSSIPD_TEST_COMMON_OBJS) $(BITCOIN_OBJS)
# Test objects depend on ../ src and headers.

View File

@ -25,8 +25,6 @@ LIGHTNINGD_TEST_COMMON_OBJS := \
common/type_to_string.o \
common/permute_tx.o
update-mocks: $(LIGHTNINGD_TEST_SRC:%=update-mocks/%)
$(LIGHTNINGD_TEST_PROGRAMS): $(CCAN_OBJS) $(BITCOIN_OBJS) $(WIRE_OBJS) $(LIGHTNINGD_TEST_COMMON_OBJS)
$(LIGHTNINGD_TEST_OBJS): $(LIGHTNINGD_HEADERS) $(LIGHTNINGD_SRC) $(LIGHTNINGD_SRC_NOHDR)

View File

@ -17,8 +17,6 @@ ONCHAIND_TEST_COMMON_OBJS := \
common/type_to_string.o \
common/utils.o
update-mocks: $(ONCHAIND_TEST_SRC:%=update-mocks/%)
$(ONCHAIND_TEST_PROGRAMS): $(ONCHAIND_TEST_COMMON_OBJS) $(BITCOIN_OBJS)
# This needs many more objs:

View File

@ -14,8 +14,6 @@ PLUGIN_TEST_COMMON_OBJS := \
common/type_to_string.o \
common/utils.o
update-mocks: $(PLUGIN_TEST_SRC:%=update-mocks/%)
$(PLUGIN_TEST_PROGRAMS): $(CCAN_OBJS) $(BITCOIN_OBJS) $(WIRE_OBJS) $(PLUGIN_TEST_COMMON_OBJS)
$(PLUGIN_TEST_OBJS): $(PLUGIN_FUNDER_HEADER) $(PLUGIN_FUNDER_SRC)

View File

@ -58,10 +58,6 @@ ALL_TEST_PROGRAMS += $(TOOL_TEST_PROGRAMS)
check-tools: $(TOOL_TEST_PROGRAMS:%=unittest/%)
endif # HAVE_PYTHON3_MAKO
update-mocks: tools-update-mocks
tools-update-mocks: $(TOOL_TEST_SRC:%=update-mocks/%)
clean: tools-test-clean
tools-test-clean:

View File

@ -30,8 +30,4 @@ WALLET_TEST_COMMON_OBJS := \
$(WALLET_TEST_PROGRAMS): $(BITCOIN_OBJS) $(WALLET_TEST_COMMON_OBJS)
$(WALLET_TEST_OBJS): $(WALLET_HDRS) $(WALLET_SRC)
wallet/tests: $(WALLET_TEST_PROGRAMS:%=unittest/%)
update-mocks: $(WALLET_TEST_SRC:%=update-mocks/%)
check-units: $(WALLET_TEST_PROGRAMS:%=unittest/%)

View File

@ -14,8 +14,6 @@ WIRE_TEST_COMMON_OBJS := \
common/setup.o \
common/utils.o
update-mocks: $(WIRE_TEST_SRC:%=update-mocks/%)
# run-tlvstream.c needs to reach into bitcoin/pubkey for SUPERVERBOSE
$(WIRE_TEST_PROGRAMS): $(WIRE_TEST_COMMON_OBJS) $(filter-out bitcoin/pubkey.o,$(BITCOIN_OBJS))