Skip to content

Fix linker warning for C++ tests #2744

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

Draft
jimklimov wants to merge 9 commits into
base: master
Choose a base branch
from
+5 −3
Draft

Fix linker warning for C++ tests #2744

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5f8c84f
tests/Makefile.am: do not LDADD libnutclient.la where we (also) use l…
jimklimov Jan 2, 2025
ca1b067
clients/Makefile.am: do not LDADD libnutclient.la to libnutclientstub…
jimklimov Jan 2, 2025
48e0963
Merge remote-tracking branch 'origin/master' into fix-ld-tests
jimklimov Apr 15, 2025
6dff742
Merge branch 'master' into fix-ld-tests
jimklimov Apr 16, 2025
4ce1977
Merge branch 'master' into fix-ld-tests
jimklimov Apr 25, 2025
9bcd487
Merge branch 'master' into fix-ld-tests
jimklimov Apr 29, 2025
4d9c5be
clients/Makefile.am: require that libnutclient.la is built when/befor…
jimklimov Apr 25, 2025
b5482ec
tests/Makefile.am, clients/Makefile.am: use only libnutclientstub.la …
jimklimov Apr 25, 2025
a9a5cf7
Revert "clients/Makefile.am: require that libnutclient.la is built wh…
jimklimov Apr 25, 2025
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
Loading