Skip to content

Commit 7b04357

Browse files
author
Rob Walker
authored
Make nlunit-test and friends into explicit deps (#423)
* Make nlunit_test and nlfaultinjection explicit deps * update tree with explicit use of internal packages * nlbuild force bandaid * fix up platform, make builds verbose to aid debug of CI * nit * revert inadvertent verbosity updates * fix inadvertent loss of SOCKETS_CPPFLAGS
1 parent d14cc1e commit 7b04357

File tree

14 files changed

+93
-49
lines changed

14 files changed

+93
-49
lines changed

‎configure.ac

+8-32
Original file line numberDiff line numberDiff line change
@@ -1543,7 +1543,6 @@ NL_WITH_OPTIONAL_INTERNAL_PACKAGE(
15431543
NLFAULTINJECTION_CPPFLAGS="-I\${abs_top_srcdir}/third_party/nlfaultinjection/repo/include"
15441544
NLFAULTINJECTION_LDFLAGS="-L${ac_pwd}/third_party/nlfaultinjection/repo/src"
15451545
NLFAULTINJECTION_LIBS="-lnlfaultinjection"
1546-
NLFAULTINJECTION_MAKEDIR=${ac_pwd}/third_party/nlfaultinjection/repo
15471546
],
15481547
[
15491548
# Check for required nlfaultinjection headers.
@@ -1614,7 +1613,6 @@ if test "${nl_cv_build_tests}" = "yes"; then
16141613
NLUNIT_TEST_CPPFLAGS="-I\${abs_top_srcdir}/third_party/nlunit-test/repo/src"
16151614
NLUNIT_TEST_LDFLAGS="-L${ac_pwd}/third_party/nlunit-test/repo/src"
16161615
NLUNIT_TEST_LIBS="-lnlunit-test"
1617-
NLUNIT_TEST_MAKEDIR=${ac_pwd}/third_party/nlunit-test/repo
16181616
],
16191617
[
16201618
# Check for required nlunit-test headers.
@@ -1858,32 +1856,6 @@ CPPFLAGS="${CPPFLAGS} ${MBEDTLS_CPPFLAGS}"
18581856
LDFLAGS="${LDFLAGS} ${MBEDTLS_LDFLAGS}"
18591857
LIBS="${LIBS} ${MBEDTLS_LIBS}"
18601858

1861-
# Add any nlunit-test CPPFLAGS, LDFLAGS, and LIBS
1862-
1863-
CPPFLAGS="${CPPFLAGS} ${NLUNIT_TEST_CPPFLAGS}"
1864-
LDFLAGS="${LDFLAGS} ${NLUNIT_TEST_LDFLAGS}"
1865-
LIBS="${LIBS} ${NLUNIT_TEST_LIBS}"
1866-
MAKEDIRS="${MAKEDIRS} ${NLUNIT_TEST_MAKEDIR}"
1867-
1868-
# Add any nlio CPPFLAGS, LDFLAGS, and LIBS
1869-
1870-
CPPFLAGS="${CPPFLAGS} ${NLIO_CPPFLAGS}"
1871-
LDFLAGS="${LDFLAGS} ${NLIO_LDFLAGS}"
1872-
LIBS="${LIBS} ${NLIO_LIBS}"
1873-
1874-
# Add any nlassert CPPFLAGS, LDFLAGS, and LIBS
1875-
1876-
CPPFLAGS="${CPPFLAGS} ${NLASSERT_CPPFLAGS}"
1877-
LDFLAGS="${LDFLAGS} ${NLASSERT_LDFLAGS}"
1878-
LIBS="${LIBS} ${NLASSERT_LIBS}"
1879-
1880-
# Add any nlfaultinjection CPPFLAGS, LDFLAGS, and LIBS
1881-
1882-
CPPFLAGS="${CPPFLAGS} ${NLFAULTINJECTION_CPPFLAGS}"
1883-
LDFLAGS="${LDFLAGS} ${NLFAULTINJECTION_LDFLAGS}"
1884-
LIBS="${LIBS} ${NLFAULTINJECTION_LIBS}"
1885-
MAKEDIRS="${MAKEDIRS} ${NLFAULTINJECTION_MAKEDIR}"
1886-
18871859
# Add any code coverage CPPFLAGS, LDFLAGS, and LIBS
18881860

18891861
CPPFLAGS="${CPPFLAGS} ${NL_COVERAGE_CPPFLAGS}"
@@ -1896,9 +1868,6 @@ if test "${nl_had_CPPFLAGS_werror}" = "no"; then
18961868
CPPFLAGS="${CPPFLAGS} ${NL_WERROR_CPPFLAGS}"
18971869
fi
18981870

1899-
# Export MAKEDIRS
1900-
1901-
AC_SUBST(MAKEDIRS, [${MAKEDIRS}])
19021871

19031872
# At this point, we can restore the compiler flags to whatever the
19041873
# user passed in, now that we're clear of an -Werror issues by
@@ -1918,14 +1887,17 @@ AC_SUBST(PRETTY_CHECK_ARGS, [""])
19181887
# Configure any autotools-based subdirectories
19191888
if test "${nl_with_nlunit_test}" = "internal"; then
19201889
AC_CONFIG_SUBDIRS([third_party/nlunit-test/repo])
1890+
AC_SUBST(NLUNIT_TEST_MAKEDIR,["${ac_pwd}/third_party/nlunit-test/repo"])
19211891
fi
19221892

19231893
if test "${nl_with_nlio}" = "internal"; then
19241894
AC_CONFIG_SUBDIRS([third_party/nlio/repo])
1895+
AC_SUBST(NLIO_MAKEDIR,["${ac_pwd}/third_party/nlunio/repo"])
19251896
fi
19261897

19271898
if test "${nl_with_nlassert}" = "internal"; then
19281899
AC_CONFIG_SUBDIRS([third_party/nlassert/repo])
1900+
AC_SUBST(NLASSERT_MAKEDIR,["${ac_pwd}/third_party/nlassert/repo"])
19291901
fi
19301902

19311903
if test "${nl_with_mbedtls}" = "internal"; then
@@ -1934,6 +1906,7 @@ fi
19341906

19351907
if test "${nl_with_nlfaultinjection}" = "internal"; then
19361908
AC_CONFIG_SUBDIRS([third_party/nlfaultinjection/repo])
1909+
AC_SUBST(NLFAULTINJECTION_MAKEDIR,["${ac_pwd}/third_party/nlfaultinjection/repo"])
19371910
fi
19381911

19391912
#
@@ -2051,18 +2024,22 @@ AC_MSG_NOTICE([
20512024
Nlunit-test compile flags : ${NLUNIT_TEST_CPPFLAGS:--}
20522025
Nlunit-test link flags : ${NLUNIT_TEST_LDFLAGS:--}
20532026
Nlunit-test link libraries : ${NLUNIT_TEST_LIBS:--}
2027+
Nlunit-test makedir : ${NLUNIT_TEST_MAKEDIR:--}
20542028
Nlio source : ${nl_with_nlio:--}
20552029
Nlio compile flags : ${NLIO_CPPFLAGS:--}
20562030
Nlio link flags : ${NLIO_LDFLAGS:--}
20572031
Nlio link libraries : ${NLIO_LIBS:--}
2032+
Nlio makedir : ${NLIO_MAKDIR:--}
20582033
Nlassert source : ${nl_with_nlassert:--}
20592034
Nlassert compile flags : ${NLASSERT_CPPFLAGS:--}
20602035
Nlassert link flags : ${NLASSERT_LDFLAGS:--}
20612036
Nlassert link libraries : ${NLASSERT_LIBS:--}
2037+
Nlassert makedir : ${NLASSERT_MAKEDIR:--}
20622038
Nlfaultinjection source : ${nl_with_nlfaultinjection:--}
20632039
Nlfaultinjection compile flags : ${NLFAULTINJECTION_CPPFLAGS:--}
20642040
Nlfaultinjection link flags : ${NLFAULTINJECTION_LDFLAGS:--}
20652041
Nlfaultinjection link libraries : ${NLFAULTINJECTION_LIBS:--}
2042+
Nlfaultinjection makedir : ${NLFAULTINJECTION_MAKEDIR:--}
20662043
Sockets compile flags : ${SOCKETS_CPPFLAGS:--}
20672044
Sockets link flags : ${SOCKETS_LDFLAGS:--}
20682045
Sockets link libraries : ${SOCKETS_LIBS:--}
@@ -2090,5 +2067,4 @@ AC_MSG_NOTICE([
20902067
Link flags : ${LDFLAGS:--}
20912068
Link libraries : ${LIBS}
20922069
Fuzzing Enabled : ${enable_fuzzing}
2093-
Make Dirs : ${MAKEDIRS:--}
20942070
])

‎src/ble/Makefile.am

+3
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ libBleLayer_a_CPPFLAGS = \
3838
-I$(top_srcdir)/src/lib \
3939
-I$(top_srcdir)/src/lib/core \
4040
-I$(top_srcdir)/src/system \
41+
$(NLASSERT_CPPFLAGS) \
42+
$(NLFAULTINJECTION_CPPFLAGS) \
43+
$(NLIO_CPPFLAGS) \
4144
$(LWIP_CPPFLAGS) \
4245
$(NULL)
4346

‎src/ble/tests/Makefile.am

+7
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ if CHIP_BUILD_TESTS
4242
AM_CPPFLAGS = \
4343
-I$(top_srcdir)/src \
4444
-I$(top_srcdir)/src/lib \
45+
$(NLIO_CPPFLAGS) \
46+
$(NLUNIT_TEST_CPPFLAGS) \
4547
$(LWIP_CPPFLAGS) \
4648
$(SOCKETS_CPPFLAGS) \
4749
$(PTHREAD_CFLAGS) \
@@ -56,9 +58,14 @@ MAKEDIR_TARGETS = \
5658
$(CHIP_LDADD) \
5759
$(NULL)
5860

61+
MAKEDIRS = \
62+
$(NLUNIT_TEST_MAKEDIR) \
63+
$(NULL)
64+
5965
COMMON_LDADD = \
6066
$(COMMON_LDFLAGS) \
6167
$(CHIP_LDADD) \
68+
$(NLUNIT_TEST_LDFLAGS) $(NLUNIT_TEST_LIBS) \
6269
$(LWIP_LDFLAGS) $(LWIP_LIBS) \
6370
$(SOCKETS_LDFLAGS) $(SOCKETS_LIBS) \
6471
$(PTHREAD_CFLAGS) $(PTHREAD_LIBS) \

‎src/crypto/Makefile.am

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ lib_LIBRARIES = libChipCrypto.a
3232
libChipCrypto_adir = $(includedir)/crypto
3333

3434
libChipCrypto_a_CPPFLAGS = \
35+
$(NLASSERT_CPPFLAGS) \
3536
-I$(top_srcdir)/src \
3637
-I$(top_srcdir)/src/lib \
3738
-I$(top_srcdir)/src/system \

‎src/crypto/tests/Makefile.am

+7
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ AM_CPPFLAGS = \
4747
-I$(top_srcdir)/src/system \
4848
-I$(top_srcdir)/src/include/ \
4949
-I$(top_srcdir)/src/crypto \
50+
$(NLASSERT_CPPFLAGS) \
51+
$(NLUNIT_TEST_CPPFLAGS) \
5052
$(NULL)
5153

5254
CHIP_LDADD = \
@@ -57,7 +59,12 @@ MAKEDIR_TARGETS = \
5759
$(CHIP_LDADD) \
5860
$(NULL)
5961

62+
MAKEDIRS = \
63+
$(NLUNIT_TEST_MAKEDIR) \
64+
$(NULL)
65+
6066
COMMON_LDADD = \
67+
$(NLUNIT_TEST_LDFLAGS) $(NLUNIT_TEST_LIBS) \
6168
$(CHIP_LDADD) \
6269
$(NULL)
6370

‎src/inet/Makefile.am

+3
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ libInetLayer_a_CPPFLAGS = \
4747
-I$(top_srcdir)/src/lib \
4848
-I$(top_srcdir)/src/lib/core \
4949
$(nl_InetLayer_CPPFLAGS) \
50+
$(NLASSERT_CPPFLAGS) \
51+
$(NLFAULTINJECTION_CPPFLAGS) \
52+
$(NLIO_CPPFLAGS) \
5053
$(LWIP_CPPFLAGS) \
5154
$(SOCKETS_CPPFLAGS) \
5255
$(NULL)

‎src/inet/tests/Makefile.am

+12
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ AM_CPPFLAGS = \
5050
-I$(top_srcdir)/src \
5151
-I$(top_srcdir)/src/include \
5252
-I$(top_srcdir)/src/lib \
53+
$(NLASSERT_CPPFLAGS) \
54+
$(NLFAULTINJECTION_CPPFLAGS) \
55+
$(NLIO_CPPFLAGS) \
56+
$(NLUNIT_TEST_CPPFLAGS) \
5357
$(LWIP_CPPFLAGS) \
5458
$(SOCKETS_CPPFLAGS) \
5559
$(PTHREAD_CFLAGS) \
@@ -72,9 +76,17 @@ MAKEDIR_TARGETS = \
7276
$(top_builddir)/src/include/CHIPVersion.h \
7377
$(NULL)
7478

79+
MAKEDIRS = \
80+
$(top_builddir)/src/include \
81+
$(NLFAULTINJECTION_MAKEDIR) \
82+
$(NLUNIT_TEST_MAKEDIR) \
83+
$(NULL)
84+
7585
COMMON_LDADD = \
7686
$(COMMON_LDFLAGS) \
7787
$(CHIP_LDADD) \
88+
$(NLFAULTINJECTION_LDFLAGS) $(NLFAULTINJECTION_LIBS)\
89+
$(NLUNIT_TEST_LDFLAGS) $(NLUNIT_TEST_LIBS) \
7890
$(LWIP_LDFLAGS) $(LWIP_LIBS) \
7991
$(SOCKETS_LDFLAGS) $(SOCKETS_LIBS) \
8092
$(PTHREAD_CFLAGS) $(PTHREAD_LIBS) \

‎src/lib/Makefile.am

+3
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ libCHIP_a_CPPFLAGS = \
5050
-I$(top_srcdir)/src/lib/core \
5151
-I$(top_srcdir)/src/lib/support \
5252
-I$(top_srcdir)/src/system \
53+
$(NLASSERT_CPPFLAGS) \
54+
$(NLFAULTINJECTION_CPPFLAGS) \
55+
$(NLIO_CPPFLAGS) \
5356
$(LWIP_CPPFLAGS) \
5457
$(SOCKETS_CPPFLAGS) \
5558
$(NULL)

‎src/lib/core/tests/Makefile.am

+16-6
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ if CHIP_BUILD_TESTS
4242
AM_CPPFLAGS = \
4343
-I$(top_srcdir)/src \
4444
-I$(top_srcdir)/src/lib \
45+
$(NLASSERT_CPPFLAGS) \
46+
$(NLIO_CPPFLAGS) \
47+
$(NLUNIT_TEST_CPPFLAGS) \
4548
$(LWIP_CPPFLAGS) \
4649
$(SOCKETS_CPPFLAGS) \
4750
$(PTHREAD_CFLAGS) \
@@ -56,12 +59,19 @@ MAKEDIR_TARGETS = \
5659
$(CHIP_LDADD) \
5760
$(NULL)
5861

59-
COMMON_LDADD = \
60-
$(COMMON_LDFLAGS) \
61-
$(CHIP_LDADD) \
62-
$(LWIP_LDFLAGS) $(LWIP_LIBS) \
63-
$(SOCKETS_LDFLAGS) $(SOCKETS_LIBS) \
64-
$(PTHREAD_CFLAGS) $(PTHREAD_LIBS) \
62+
MAKEDIRS = \
63+
$(NLFAULTINJECTION_MAKEDIR) \
64+
$(NLUNIT_TEST_MAKEDIR) \
65+
$(NULL)
66+
67+
COMMON_LDADD = \
68+
$(COMMON_LDFLAGS) \
69+
$(CHIP_LDADD) \
70+
$(NLFAULTINJECTION_LDFLAGS) $(NLFAULTINJECTION_LIBS) \
71+
$(NLUNIT_TEST_LDFLAGS) $(NLUNIT_TEST_LIBS) \
72+
$(LWIP_LDFLAGS) $(LWIP_LIBS) \
73+
$(SOCKETS_LDFLAGS) $(SOCKETS_LIBS) \
74+
$(PTHREAD_CFLAGS) $(PTHREAD_LIBS) \
6575
$(NULL)
6676

6777
# Test applications that should be run when the 'check' target is run.

‎src/lib/support/Makefile.am

+2
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ libSupportLayer_a_CPPFLAGS = \
3535
-I$(top_srcdir)/src \
3636
-I$(top_srcdir)/src/lib \
3737
-I$(top_srcdir)/src/include \
38+
$(NLASSERT_CPPFLAGS) \
39+
$(NLFAULTINJECTION_CPPFLAGS) \
3840
$(NULL)
3941

4042
libSupportLayer_a_SOURCES = $(CHIP_BUILD_SUPPORT_LAYER_SOURCE_FILES)

‎src/platform/Makefile.am

+2
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@ libDeviceLayer_a_CPPFLAGS = \
8080
-I$(top_srcdir)/src/lib \
8181
-I$(top_srcdir)/src/system \
8282
-I$(top_srcdir)/src \
83+
$(NLASSERT_CPPFLAGS) \
84+
$(NLIO_CPPFLAGS) \
8385
$(LWIP_CPPFLAGS) \
8486
$(SOCKETS_CPPFLAGS) \
8587
$(NULL)

‎src/system/Makefile.am

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ SUBDIRS = \
2929
tests \
3030
$(NULL)
3131

32-
3332
EXTRA_DIST = \
3433
SystemLayerPrivate.h \
3534
$(NULL)
@@ -42,6 +41,8 @@ libSystemLayer_a_CPPFLAGS = \
4241
-I$(top_srcdir)/src/system \
4342
-I$(top_srcdir)/src/lib \
4443
-I$(top_srcdir)/src/lib/core \
44+
$(NLASSERT_CPPFLAGS) \
45+
$(NLFAULTINJECTION_CPPFLAGS) \
4546
$(LWIP_CPPFLAGS) \
4647
$(SOCKETS_CPPFLAGS) \
4748
$(NULL)

‎src/system/tests/Makefile.am

+15-6
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ AM_CPPFLAGS = \
4646
-I$(top_srcdir)/src/lib \
4747
-I$(top_srcdir)/src/lib/core \
4848
-I$(top_srcdir)/src/system \
49+
$(NLASSERT_CPPFLAGS) \
50+
$(NLUNIT_TEST_CPPFLAGS) \
4951
$(LWIP_CPPFLAGS) \
5052
$(SOCKETS_CPPFLAGS) \
5153
$(PTHREAD_CFLAGS) \
@@ -60,12 +62,19 @@ MAKEDIR_TARGETS = \
6062
$(CHIP_LDADD) \
6163
$(NULL)
6264

63-
COMMON_LDADD = \
64-
$(COMMON_LDFLAGS) \
65-
$(CHIP_LDADD) \
66-
$(LWIP_LDFLAGS) $(LWIP_LIBS) \
67-
$(SOCKETS_LDFLAGS) $(SOCKETS_LIBS) \
68-
$(PTHREAD_CFLAGS) $(PTHREAD_LIBS) \
65+
MAKEDIRS = \
66+
$(NLUNIT_TEST_MAKEDIR) \
67+
$(NLFAULTINJECTION_MAKEDIR) \
68+
$(NULL)
69+
70+
COMMON_LDADD = \
71+
$(COMMON_LDFLAGS) \
72+
$(CHIP_LDADD) \
73+
$(NLUNIT_TEST_LDFLAGS) $(NLUNIT_TEST_LIBS) \
74+
$(NLFAULTINJECTION_LDFLAGS) $(NLFAULTINJECTION_LIBS) \
75+
$(LWIP_LDFLAGS) $(LWIP_LIBS) \
76+
$(SOCKETS_LDFLAGS) $(SOCKETS_LIBS) \
77+
$(PTHREAD_CFLAGS) $(PTHREAD_LIBS) \
6978
$(NULL)
7079

7180
# Test applications that should be run when the 'check' target is run.

‎third_party/nlbuild-autotools/repo/automake/post/rules/makedirs.am

+12-4
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,19 @@
3131
# (all _OBJECTS) defined by a Makefile.am to depend upon an invocation
3232
# of `$(MAKE) -C <DIR>` in that directory.
3333
#
34+
35+
# same as ifdef MAKEDIRS || MAKEDIR_TARGETS
36+
ifneq ($(strip $(MAKEDIRS)$(MAKEDIR_TARGETS)),)
37+
38+
.PHONY: makedirs-force
39+
makedirs-force: # no rules, please always build ;)
40+
41+
endif # ifneq ($(strip $(MAKEDIRS)$(MAKEDIR_TARGETS)),)
42+
3443
ifdef MAKEDIRS
3544

36-
.PHONY: makedirs force
45+
.PHONY: makedirs
3746

38-
force: # no rules, please always build ;)
3947

4048
# The way we make a MAKEDIR
4149
define makedirs-make
@@ -54,15 +62,15 @@ $(foreach objects,$(filter %_OBJECTS,$(.VARIABLES)),\
5462
$(foreach object,$($(objects)),\
5563
$(eval $(call makedirs-depends,$(object)))))
5664

57-
makedirs: force
65+
makedirs: makedirs-force
5866
$(foreach dir,$(MAKEDIRS),$(call makedirs-make,$(dir)))
5967

6068
endif # ifdef MAKEDIRS
6169

6270
ifdef MAKEDIR_TARGETS
6371
# The way me make a MAKEDIR_TARGET
6472
define makedirs-makedir-target-rule
65-
$1: force
73+
$1: makedirs-force
6674
$(MAKE) -C $$(dir $$(@)) $$(notdir $$(@))
6775
endef # makedirs-makedir-target-rule
6876

0 commit comments

Comments
 (0)