This means we don't have to manually choose what to link against, which is much of the complexity of our Makefiles: the compiler will automatically use any object files it needs to link. We already do this for ccan as libccan.a, now we have libcommon.a. We don't link against it for *everything*, as some tests require their own versions. Notes: 1. I get rid of the weird plugins/test/Makefile2 (accidental commit?) 2. Many tests change due to update-mocks. 3. In some places I added the missing dependency on the Makefile itself, though most are in the next patch. Before: Total program size: 221366528 Total tests size: 364243856 After: Total program size: 190733656 Total tests size: 337880888 Build time from make clean (RUST=0) (includes building external libs): Before: real 0m38.227000-44.245000(41.8222+/-1.6)s user 3m2.105000-33.696000(23.1442+/-8.4)s sys 0m35.054000-42.269000(39.7231+/-2)s After: real 0m38.944000-40.416000(40.1131+/-0.4)s user 3m6.790000-17.159000(15.0571+/-2.8)s sys 0m35.304000-37.336000(36.8942+/-0.57)s Build time after touch config.vars (RUST=0): Before: real 0m18.928000-22.776000(21.5084+/-1.1)s user 2m8.613000-36.567000(27.7281+/-7.7)s sys 0m20.458000-23.436000(22.3963+/-0.77)s After: real 0m19.831000-21.862000(21.5528+/-0.58)s user 2m15.361000-30.731000(28.4798+/-4.4)s sys 0m21.056000-22.339000(22.0346+/-0.35)s Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> rusty@rusty-Framework:~/devel/cvs/lightni
32 lines
1018 B
Makefile
32 lines
1018 B
Makefile
check-units: onchaind-tests
|
|
|
|
# Note that these actually #include everything they need, except ccan/ and bitcoin/.
|
|
# That allows for unit testing of statics, and special effects.
|
|
ONCHAIND_TEST_SRC := $(wildcard onchaind/test/run-*.c)
|
|
ONCHAIND_TEST_OBJS := $(ONCHAIND_TEST_SRC:.c=.o)
|
|
ONCHAIND_TEST_PROGRAMS := $(ONCHAIND_TEST_OBJS:.o=)
|
|
|
|
ALL_C_SOURCES += $(ONCHAIND_TEST_SRC)
|
|
ALL_TEST_PROGRAMS += $(ONCHAIND_TEST_PROGRAMS)
|
|
|
|
# test/run-grind_feerate-bug uses its own htlc_timeout_tx()
|
|
$(filter-out onchaind/test/run-grind_feerate-bug,$(ONCHAIND_TEST_PROGRAMS)): libcommon.a
|
|
|
|
onchaind/test/run-grind_feerate-bug: \
|
|
$(BITCOIN_OBJS) \
|
|
wire/towire.o \
|
|
wire/fromwire.o \
|
|
common/amount.o \
|
|
common/autodata.o \
|
|
common/features.o \
|
|
common/psbt_keypath.o \
|
|
common/pseudorand.o \
|
|
common/setup.o \
|
|
common/utils.o
|
|
|
|
# Test objects depend on ../ src and headers.
|
|
$(ONCHAIND_TEST_OBJS): $(ONCHAIND_HEADERS) $(ONCHAIND_SRC) onchaind/test/Makefile
|
|
|
|
onchaind-tests: $(ONCHAIND_TEST_PROGRAMS:%=unittest/%)
|
|
|