Author: aconway
Date: Wed May 14 12:10:30 2008
New Revision: 656369
URL: http://svn.apache.org/viewvc?rev=656369&view=rev
Log:
Undo revision 656320, causing build problems.
Added:
incubator/qpid/trunk/qpid/cpp/src/tests/.valgrind.supp
- copied unchanged from r656319,
incubator/qpid/trunk/qpid/cpp/src/tests/.valgrind.supp
incubator/qpid/trunk/qpid/cpp/src/tests/.valgrindrc
- copied unchanged from r656319,
incubator/qpid/trunk/qpid/cpp/src/tests/.valgrindrc
Removed:
incubator/qpid/trunk/qpid/cpp/src/tests/valgrind.suppress
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=656369&r1=656368&r2=656369&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am Wed May 14 12:10:30 2008
@@ -125,17 +125,10 @@
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
@@ -148,8 +141,8 @@
quick_perftest \
topictest \
run_federation_tests \
- valgrind.suppress \
- valgrindrc \
+ .valgrind.supp \
+ .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=656369&r1=656368&r2=656369&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/python_tests (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/python_tests Wed May 14 12:10:30
2008
@@ -1,17 +1,19 @@
#!/bin/sh
# Run the python tests.
-
QPID_PORT=${QPID_PORT:-5672}
PYTHON_TESTS=${PYTHON_TESTS:-$*}
MY_DIR=$(dirname $(which $0))
-QPID_PYTHON_DIR=${QPID_PYTHON_DIR:-$MY_DIR/../../../python}
+PYTHON_DIR=${MY_DIR}/../../../python
-do_tests() {
+run() {
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; }
}
-cd ${QPID_PYTHON_DIR} || { echo "Cannot cd ${QPID_PYTHON_DIR}"; exit; }
-do_tests 0-10-errata cpp_failing_0-10.txt
-
+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
