Skip to content

tests/Makefile.am: restructure and comment cppunittest_LDADD and cppnit_LDADD #2930

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

Merged
jimklimov merged 1 commit into from
May 1, 2025
Merged

tests/Makefile.am: restructure and comment cppunittest_LDADD and cppnit_LDADD #2930

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions tests/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,11 +152,12 @@ TESTS += $(TESTS_CXX11)
# Note: we only build it, but do not run directly (NIT prepares the sandbox)
check_PROGRAMS += cppnit

# NOTE: libnutclientstub includes libnutclient and adds nutclientmem
cppunittest_CXXFLAGS = $(AM_CXXFLAGS) $(CPPUNIT_CFLAGS) $(CPPUNIT_CXXFLAGS) $(CPPUNIT_NUT_CXXFLAGS) $(CXXFLAGS)
###cppunittest_CXXFLAGS += -I$(top_srcdir)/include -DTOP_SRCDIR="\"$(top_srcdir)\""
cppunittest_LDFLAGS = $(CPPUNIT_LDFLAGS) $(CPPUNIT_LIBS)
cppunittest_LDADD = $(top_builddir)/clients/libnutclient.la
cppunittest_LDADD += $(top_builddir)/clients/libnutclientstub.la
cppunittest_LDADD = $(top_builddir)/clients/libnutclientstub.la
cppunittest_LDADD += $(top_builddir)/clients/libnutclient.la
cppunittest_SOURCES = $(CPPUNITTESTSRC) $(CPPUNITTESTERSRC)

# Currently nutconf and related codebase causes woes for static analysis
Expand All @@ -168,7 +169,8 @@ endif WITH_LIBNUTCONF

cppnit_CXXFLAGS = $(AM_CXXFLAGS) $(CPPUNIT_CFLAGS) $(CPPUNIT_CXXFLAGS) $(CPPUNIT_NUT_CXXFLAGS) $(CXXFLAGS)
cppnit_LDFLAGS = $(CPPUNIT_LDFLAGS) $(CPPUNIT_LIBS)
cppnit_LDADD = $(top_builddir)/clients/libnutclient.la $(top_builddir)/clients/libnutclientstub.la
cppnit_LDADD = $(top_builddir)/clients/libnutclientstub.la
cppnit_LDADD += $(top_builddir)/clients/libnutclient.la
cppnit_SOURCES = $(CPPCLIENTTESTSRC) $(CPPUNITTESTERSRC)

# Make sure out-of-dir C++ dependencies exist (especially when dev-building
Expand Down