diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2009-11-30 06:21:49 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2009-11-30 06:21:49 +0000 |
| commit | b44a8788b44fc8c530841019b26af64b5fca1c5f (patch) | |
| tree | ace9287d412d1037a6f87d4da585596acbe2341a | |
| parent | edc043f29b9aa7e686b151de5abe6b99118ac980 (diff) | |
| download | qpid-python-b44a8788b44fc8c530841019b26af64b5fca1c5f.tar.gz | |
Fix autotool dependency on installed libtool for running "make check"
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@885339 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | cpp/src/tests/Makefile.am | 1 | ||||
| -rwxr-xr-x | cpp/src/tests/run_test | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/tests/Makefile.am b/cpp/src/tests/Makefile.am index 2d4d6ec0cf..44e1574968 100644 --- a/cpp/src/tests/Makefile.am +++ b/cpp/src/tests/Makefile.am @@ -279,6 +279,7 @@ qpid_stream_LDADD=$(lib_client) TESTS_ENVIRONMENT = \ VALGRIND=$(VALGRIND) \ + LIBTOOL="$(LIBTOOL)" \ srcdir=$(srcdir) \ top_builddir=$(top_builddir) \ QPID_DATA_DIR= \ diff --git a/cpp/src/tests/run_test b/cpp/src/tests/run_test index 5d8167ff4b..130584ff9b 100755 --- a/cpp/src/tests/run_test +++ b/cpp/src/tests/run_test @@ -35,7 +35,7 @@ srcdir=`dirname $0` . $srcdir/vg_check # Export variables from makefile. -export VALGRIND srcdir +export srcdir # Set QPID_PORT if qpidd.port exists. test -s qpidd.port && QPID_PORT=`cat qpidd.port` @@ -67,7 +67,7 @@ if grep -l "^# Generated by .*libtool" "$1" >/dev/null 2>&1; then # This is a libtool "executable". Valgrind it if VALGRIND specified. test -n "$VALGRIND" && VALGRIND="$VALGRIND $VALGRIND_OPTS" # Hide output unless there's an error. - libtool --mode=execute $VALGRIND "$@" 2>&1 || ERROR=1 + $LIBTOOL --mode=execute $VALGRIND "$@" 2>&1 || ERROR=1 test -n "$VALGRIND" && { vg_check $VG_LOG* || ERROR=1 ; } else # This is a non-libtool shell script, just execute it. |