Author: aconway
Date: 2011-02-15 14:23:14 -0500 (Tue, 15 Feb 2011)
New Revision: 4440
Modified:
store/trunk/cpp/tests/cluster/Makefile.am
store/trunk/cpp/tests/cluster/cluster_tests_env.sh
Log:
Fix cluster_tests_env.sh to work in a VPATH build.
Modified: store/trunk/cpp/tests/cluster/Makefile.am
===================================================================
--- store/trunk/cpp/tests/cluster/Makefile.am 2011-01-21 17:49:28 UTC (rev 4439)
+++ store/trunk/cpp/tests/cluster/Makefile.am 2011-02-15 19:23:14 UTC (rev 4440)
@@ -50,7 +50,8 @@
VALGRIND=$(VALGRIND) \
STORE_LIB=$(abs_builddir)/../../lib/.libs/msgstore.so \
TMP_DATA_DIR=$(TMP_DATA_DIR) \
- abs_srcdir=$(abs_srcdir)
+ abs_srcdir=$(abs_srcdir) \
+ abs_builddir=$(abs_builddir)
EXTRA_DIST = \
cluster_tests_env.sh \
Modified: store/trunk/cpp/tests/cluster/cluster_tests_env.sh
===================================================================
--- store/trunk/cpp/tests/cluster/cluster_tests_env.sh 2011-01-21 17:49:28 UTC (rev 4439)
+++ store/trunk/cpp/tests/cluster/cluster_tests_env.sh 2011-02-15 19:23:14 UTC (rev 4440)
@@ -280,7 +280,7 @@
if test -z ${abs_srcdir}; then
abs_srcdir=${srcdir}
fi
-export STORE_LIB="${abs_srcdir}/../../lib/.libs/msgstore.so"
+export STORE_LIB="${abs_builddir}/../../lib/.libs/msgstore.so"
PYTHON_TESTNAME=cluster_tests.py
func_set_env