]> git.ipfire.org Git - thirdparty/strongswan.git/commitdiff
unit-tests: Make sure plugins in the builddir are loaded
authorTobias Brunner <tobias@strongswan.org>
Fri, 9 May 2014 11:28:06 +0000 (13:28 +0200)
committerTobias Brunner <tobias@strongswan.org>
Mon, 19 May 2014 12:06:43 +0000 (14:06 +0200)
When running the tests in GDB the working directory apparently is
different.  With the relative path used previously the plugins would not
be found and those installed on the system would get used.

src/libstrongswan/tests/Makefile.am
src/libtls/tests/Makefile.am

index 331a5480d472f1227287245e7c0645436693c4b8..b5fb45a1f0d0a88faab697086afbed104fe4b96c 100644 (file)
@@ -52,7 +52,7 @@ tests_SOURCES = tests.h tests.c \
 tests_CFLAGS = \
   -I$(top_srcdir)/src/libstrongswan \
   -I$(top_srcdir)/src/libstrongswan/tests \
-  -DPLUGINDIR=\""$(top_builddir)/src/libstrongswan/plugins\"" \
+  -DPLUGINDIR=\""$(abs_top_builddir)/src/libstrongswan/plugins\"" \
   -DPLUGINS=\""${s_plugins}\"" \
   @COVERAGE_CFLAGS@
 
index 1c0e2f941cfcdd8e1653ed92e4e4c426c7768f36..456383f02cadac8a206eb6f4bead155e5ec9a3d6 100644 (file)
@@ -11,7 +11,7 @@ tls_tests_CFLAGS = \
        -I$(top_srcdir)/src/libtls \
        -I$(top_srcdir)/src/libstrongswan \
        -I$(top_srcdir)/src/libstrongswan/tests \
-       -DPLUGINDIR=\""$(top_builddir)/src/libstrongswan/plugins\"" \
+       -DPLUGINDIR=\""$(abs_top_builddir)/src/libstrongswan/plugins\"" \
        -DPLUGINS=\""${s_plugins}\"" \
        @COVERAGE_CFLAGS@