X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=t%2Fintegration%2Ftest_lib.sh;h=fe4efe3c1945ac9626017ff931a3ec6629d28d8c;hp=1fb3324ca332081fddc9dac43392913cad21e966;hb=e5d9a9165aaedbfb3b5f6e0bbbb4993d6343fe55;hpb=f11a5f519d0f9ba8c8a0a116fc046b5a1c3e804f

diff --git a/t/integration/test_lib.sh b/t/integration/test_lib.sh
index 1fb3324..fe4efe3 100644
--- a/t/integration/test_lib.sh
+++ b/t/integration/test_lib.sh
@@ -29,18 +29,28 @@
 #
 
 TOP_SRCDIR="$( readlink -f "$( dirname "$0" )/../.." )"
+TOP_BUILDDIR="$TOP_SRCDIR"
+if test -n "$VPATH"; then
+	# We'll have to guess.
+	if test -d ../t; then
+		TOP_BUILDDIR="$( readlink -f .. )"
+	else if test -d t; then
+		TOP_BUILDDIR="$( readlink -f . )"
+	fi; fi
+fi
+
 TESTDIR="$( mktemp -d )"
 trap "rm -rf '$TESTDIR'; test -z \$SYSDBD_PID || kill \$SYSDBD_PID" EXIT
 
 mkdir "$TESTDIR/backend"
-cp "$TOP_SRCDIR/t/integration/.libs/mock_timeseries.so" "$TESTDIR"
-cp "$TOP_SRCDIR/t/integration/.libs/mock_plugin.so" "$TESTDIR/backend"
+cp "$TOP_BUILDDIR/t/integration/.libs/mock_timeseries.so" "$TESTDIR"
+cp "$TOP_BUILDDIR/t/integration/.libs/mock_plugin.so" "$TESTDIR/backend"
 
 mkdir "$TESTDIR/store"
-cp "$TOP_SRCDIR/src/plugins/store/.libs/network.so" "$TESTDIR/store"
+cp "$TOP_BUILDDIR/src/plugins/store/.libs/network.so" "$TESTDIR/store"
 
-cp "$TOP_SRCDIR"/src/sysdb "$TESTDIR"
-cp "$TOP_SRCDIR"/src/sysdbd "$TESTDIR"
+cp "$TOP_BUILDDIR"/src/sysdb "$TESTDIR"
+cp "$TOP_BUILDDIR"/src/sysdbd "$TESTDIR"
 
 MEMCHECK="valgrind --quiet --tool=memcheck --error-exitcode=1"
 MEMCHECK="$MEMCHECK --trace-children=yes"