Skip to content

Fix api_base_test failures with shared only builds and on modern glibc #41

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

Open
ssam18 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix api_base_test failures with shared only builds and on modern glibc #41

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
10 changes: 10 additions & 0 deletions api/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,13 @@ libdaq_la_CPPFLAGS = $(AM_CPPFLAGS) $(CODE_COVERAGE_CPPFLAGS)
libdaq_la_CFLAGS = $(AM_CFLAGS) $(CODE_COVERAGE_CFLAGS)
libdaq_la_LDFLAGS = $(CODE_COVERAGE_LDFLAGS) -version-info 3:0:0
libdaq_la_LIBADD = $(LIBDL)

# Convenience library for the unit tests. The tests mock libc functions with
# ld's --wrap option, which only affects symbols resolved at static link time,
# so they must link the DAQ library statically even when configured with
# --disable-static.
check_LTLIBRARIES = libdaq_check.la
libdaq_check_la_SOURCES = $(libdaq_la_SOURCES)
libdaq_check_la_CPPFLAGS = $(libdaq_la_CPPFLAGS)
libdaq_check_la_CFLAGS = $(libdaq_la_CFLAGS)
libdaq_check_la_LIBADD = $(LIBDL)
6 changes: 4 additions & 2 deletions test/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ api_base_test_CFLAGS = $(AM_CFLAGS) $(CODE_COVERAGE_CFLAGS) $(CMOCKA_CFLAGS) -I$
api_base_test_LDFLAGS = \
$(AM_LDFLAGS) \
$(CODE_COVERAGE_LDFLAGS) \
-static-libtool-libs \
-Wl,--wrap,printf \
-Wl,--wrap,__printf_chk \
-Wl,--wrap,fprintf \
Expand All @@ -19,7 +18,7 @@ api_base_test_LDFLAGS = \
-Wl,--wrap,dlopen \
-Wl,--wrap,dlsym \
-Wl,--wrap,dlclose
api_base_test_LDADD = ${top_builddir}/api/libdaq.la $(LIBDL) $(CMOCKA_LIBS)
api_base_test_LDADD = ${top_builddir}/api/libdaq_check.la $(LIBDL) $(CMOCKA_LIBS)

api_config_test_SOURCES = api_config_test.c daq_test_module.c daq_test_module.h
api_config_test_CFLAGS = $(AM_CFLAGS) $(CODE_COVERAGE_CFLAGS) $(CMOCKA_CFLAGS) -I${top_srcdir}/api
Expand All @@ -28,3 +27,6 @@ api_config_test_LDFLAGS = \
$(CODE_COVERAGE_LDFLAGS) \
-static-libtool-libs
api_config_test_LDADD = ${top_builddir}/api/libdaq.la $(LIBDL) $(CMOCKA_LIBS)

${top_builddir}/api/libdaq_check.la:
$(MAKE) -C ${top_builddir}/api libdaq_check.la
12 changes: 10 additions & 2 deletions test/api_base_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,15 @@ int __wrap_closedir(DIR *dirp)
return 0;
}

/* Prior to glibc 2.33, stat() could be an extern inline function calling __xstat(),
so references from the library under test resolve to __xstat instead of stat. */
#ifdef __USE_EXTERN_INLINES
#if !defined(__GLIBC_PREREQ) || !__GLIBC_PREREQ(2, 33)
#define WRAP_XSTAT
#endif
#endif

#ifdef WRAP_XSTAT

int __wrap___xstat(int ver, const char *pathname, struct stat *buf);
int __wrap___xstat(int ver, const char *pathname, struct stat *buf)
Expand All @@ -155,7 +163,7 @@ int __wrap_stat(const char *pathname, struct stat *buf)
return mock();
}

#endif /* __USE_EXTERN_INLINES */
#endif /* WRAP_XSTAT */

void *__wrap_dlopen(const char *filename, int flags);
void *__wrap_dlopen(const char *filename, int flags)
Expand Down Expand Up @@ -286,7 +294,7 @@ static void test_daq_load_modules(void **state)

expect_value(__wrap_readdir, dirp, 0xdeadbeef);
will_return(__wrap_readdir, &deadbeef_dir_entry);
#ifdef __USE_EXTERN_INLINES
#ifdef WRAP_XSTAT
expect_string(__wrap___xstat, pathname, MODULE_PATH "/" BAD_MODULE_NAME ".so");
will_return(__wrap___xstat, 0);
#else
Expand Down