testsuite: allow to run tests outside of top_buildir

In order to locate where the shared libs to be preloaded are we need to
reference them using abs_top_buildir. Otherwise we are limited to
running tests from there.

diff --git a/Makefile.am b/Makefile.am
index 6e9a45d2609740e1d0ab2f58925cd611f4307521..e5f3348042de411782be1574e265cc4589314769 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -158,21 +158,26 @@ testsuite-distclean:
 DISTCLEAN_LOCAL_HOOKS += testsuite-distclean
 EXTRA_DIST += testsuite/rootfs.tar.xz
 
+TESTSUITE_CPPFLAGS = $(AM_CPPFLAGS) \
+                    -DTESTSUITE_ROOTFS=\"$(abs_top_builddir)/testsuite/rootfs/\" \
+                    -DABS_TOP_BUILDDIR=\"$(abs_top_builddir)\"
+
 check_LTLIBRARIES = testsuite/libtestsuite.la
 testsuite_libtestsuite_la_SOURCES = testsuite/testsuite.c \
                                    testsuite/testsuite.h
 testsuite_libtestsuite_la_DEPENDENCIES = testsuite/uname.so \
                                         testsuite/path.so \
                                         testsuite/rootfs
-testsuite_test_testsuite_CPPFLAGS = $(AM_CPPFLAGS) \
-                                   -DTESTSUITE_ROOTFS=\"$(abs_top_builddir)/testsuite/rootfs/\"
+testsuite_libtestsuite_la_CPPFLAGS = $(TESTSUITE_CPPFLAGS)
 
 TESTSUITE = testsuite/test-init testsuite/test-testsuite
 check_PROGRAMS = $(TESTSUITE)
 TESTS = $(TESTSUITE)
 
 testsuite_test_init_LDADD = testsuite/libtestsuite.la libkmod/libkmod-private.la
+testsuite_test_init_CPPFLAGS = $(TESTSUITE_CPPFLAGS)
 testsuite_test_testsuite_LDADD = testsuite/libtestsuite.la
+testsuite_test_testsuite_CPPFLAGS = $(TESTSUITE_CPPFLAGS)
 
 DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
 

diff --git a/testsuite/testsuite.c b/testsuite/testsuite.c
index f26e358d1991cba634a694d1da54272a1a0fa5c4..0f9a361e1d3e4d05c38df185cfc25b888d620687 100644 (file)
--- a/testsuite/testsuite.c
+++ b/testsuite/testsuite.c
@@ -25,8 +25,8 @@ struct _env_config {
        const char *key;
        const char *ldpreload;
 } env_config[_TC_LAST] = {
-       [TC_UNAME_R] = { S_TC_UNAME_R, "./testsuite/uname.so" },
-       [TC_ROOTFS] = { S_TC_ROOTFS, "./testsuite/path.so" },
+       [TC_UNAME_R] = { S_TC_UNAME_R, ABS_TOP_BUILDDIR "/testsuite/uname.so" },
+       [TC_ROOTFS] = { S_TC_ROOTFS, ABS_TOP_BUILDDIR "/testsuite/path.so" },
 };
 
 static void help(void)