Author: aconway
Date: Wed May 14 08:39:02 2008
New Revision: 656320
URL: http://svn.apache.org/viewvc?rev=656320&view=rev
Log:
Fix valgrind problems in VPATH builds.
Added:
incubator/qpid/trunk/qpid/cpp/src/tests/valgrind.suppress
- copied unchanged from r656279,
incubator/qpid/trunk/qpid/cpp/src/tests/.valgrind.supp
incubator/qpid/trunk/qpid/cpp/src/tests/valgrindrc
- copied, changed from r656279,
incubator/qpid/trunk/qpid/cpp/src/tests/.valgrindrc
Removed:
incubator/qpid/trunk/qpid/cpp/src/tests/.valgrind.supp
incubator/qpid/trunk/qpid/cpp/src/tests/.valgrindrc
Modified:
incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am
incubator/qpid/trunk/qpid/cpp/src/tests/python_tests
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am?rev=656320&r1=656319&r2=656320&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am Wed May 14 08:39:02 2008
@@ -125,10 +125,17 @@
client_test \
topic_listener \
topic_publisher
-# echo_service
check_PROGRAMS += $(testprogs) interop_runner publish consume
+# Copy the SVN valgrind files to the real valgrind files so we will
+# have the real files in the working dir for VPATH or in-tree builds.
+check_DATA = .valgrindrc .valgrind.suppress
+.valgrindrc: valgrindrc
+ cp $^ $@
+.valgrind.suppress: valgrind.suppress
+ cp $^ $@
+
TESTS_ENVIRONMENT = VALGRIND=$(VALGRIND) srcdir=$(srcdir) QPID_DATA_DIR=
$(srcdir)/run_test
system_tests = client_test quick_perftest quick_topictest
@@ -141,8 +148,8 @@
quick_perftest \
topictest \
run_federation_tests \
- .valgrind.supp \
- .valgrindrc \
+ valgrind.suppress \
+ valgrindrc \
MessageUtils.h \
MockConnectionInputHandler.h \
TxMocks.h \
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/python_tests
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/python_tests?rev=656320&r1=656319&r2=656320&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/python_tests (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/python_tests Wed May 14 08:39:02
2008
@@ -1,19 +1,17 @@
#!/bin/sh
# Run the python tests.
+
QPID_PORT=${QPID_PORT:-5672}
PYTHON_TESTS=${PYTHON_TESTS:-$*}
MY_DIR=$(dirname $(which $0))
-PYTHON_DIR=${MY_DIR}/../../../python
+QPID_PYTHON_DIR=${QPID_PYTHON_DIR:-$MY_DIR/../../../python}
-run() {
+do_tests() {
SPEC=$1
FAILING=$2
./run-tests --skip-self-test -v -s $SPEC -I $FAILING -b
localhost:$QPID_PORT $PYTHON_TESTS || { echo "FAIL python tests for $SPEC";
exit 1; }
}
-if test -d ${PYTHON_DIR} ; then
- cd ${PYTHON_DIR}
- run 0-10-errata cpp_failing_0-10.txt
-else
- echo Warning: python tests not found.
-fi
+cd ${QPID_PYTHON_DIR} || { echo "Cannot cd ${QPID_PYTHON_DIR}"; exit 1; }
+do_tests 0-10-errata cpp_failing_0-10.txt
+
Copied: incubator/qpid/trunk/qpid/cpp/src/tests/valgrindrc (from r656279,
incubator/qpid/trunk/qpid/cpp/src/tests/.valgrindrc)
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/valgrindrc?p2=incubator/qpid/trunk/qpid/cpp/src/tests/valgrindrc&p1=incubator/qpid/trunk/qpid/cpp/src/tests/.valgrindrc&r1=656279&r2=656320&rev=656320&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/.valgrindrc (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/valgrindrc Wed May 14 08:39:02 2008
@@ -1,7 +1,7 @@
--gen-suppressions=all
--leak-check=full
--demangle=yes
---suppressions=.valgrind.supp
+--suppressions=.valgrind.suppress
--num-callers=25
--trace-children=yes
--error-exitcode=1
