Skip to content

prov/efa: fix unit test linking to not affect libfabric.so #12001

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
sunkuamzn wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

prov/efa: fix unit test linking to not affect libfabric.so #12001

Show file tree
Hide file tree
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 prov/efa/Makefile.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,9 @@ nodist_prov_efa_test_efa_unit_test_SOURCES = \
efa_CPPFLAGS += -I$(top_srcdir)/include -I$(top_srcdir)/prov/efa/test $(cmocka_CPPFLAGS)

prov_efa_test_efa_unit_test_CPPFLAGS = $(efa_CPPFLAGS)
prov_efa_test_efa_unit_test_LDADD = $(cmocka_LIBS) $(linkback)
prov_efa_test_efa_unit_test_LDFLAGS = $(cmocka_rpath) $(efa_LDFLAGS) $(cmocka_LDFLAGS) \
prov_efa_test_efa_unit_test_LDADD = $(efa_LIBS) -lrdmacm -libverbs -lpthread -ldl
prov_efa_test_efa_unit_test_LDFLAGS = $(efa_LDFLAGS) $(cmocka_rpath) $(cmocka_LIBS_STATIC) \
-Wl,--whole-archive,$(top_builddir)/src/.libs/libfabric.a,--no-whole-archive \
-Wl,--wrap=ibv_create_ah \
-Wl,--wrap=ibv_destroy_ah \
-Wl,--wrap=ibv_is_fork_initialized \
Expand Down Expand Up @@ -234,7 +235,8 @@ if HAVE_EFADV_QUERY_CQ
prov_efa_test_efa_unit_test_LDFLAGS += -Wl,--wrap=efadv_query_cq
endif HAVE_EFADV_QUERY_CQ

prov_efa_test_efa_unit_test_LIBS = $(efa_LIBS) $(linkback)
prov_efa_test_efa_unit_test_LIBS = $(efa_LIBS)
prov_efa_test_efa_unit_test_DEPENDENCIES = $(top_builddir)/src/libfabric.la

endif ENABLE_EFA_UNIT_TEST

Expand Down
3 changes: 2 additions & 1 deletion prov/efa/configure.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ AC_DEFUN([FI_EFA_CONFIGURE],[
[],
[$cmocka_dir],
[],
[efa_LIBS+=" $cmocka_LDFLAGS $cmocka_LIBS -static"],
[cmocka_LIBS_STATIC="$cmocka_LDFLAGS $cmocka_LIBS"],
[AC_MSG_ERROR([Cannot compile EFA unit tests without a valid Cmocka installation directory.])],
[
#include <stdarg.h>
Expand All @@ -323,6 +323,7 @@ AC_DEFUN([FI_EFA_CONFIGURE],[
])

AC_SUBST(cmocka_rpath)
AC_SUBST(cmocka_LIBS_STATIC)
AC_DEFINE_UNQUOTED([EFA_UNIT_TEST], [$efa_unit_test], [EFA unit testing])

AM_CONDITIONAL([HAVE_EFADV_CQ_EX], [ test $efadv_support_extended_cq = 1])
Expand Down