summaryrefslogtreecommitdiff
path: root/qpid/cpp/src/tests/run-unit-tests
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2007-04-02 20:27:21 +0000
committerAlan Conway <aconway@apache.org>2007-04-02 20:27:21 +0000
commitc7de0c94a03478ca5ef7dc6085407bd464ad2214 (patch)
treecb79ed61f7fd83aabba4322864bb83ccc16b616e /qpid/cpp/src/tests/run-unit-tests
parentfea1cde4749b111bf14bf503fa945a994b469808 (diff)
downloadqpid-python-c7de0c94a03478ca5ef7dc6085407bd464ad2214.tar.gz
* src/tests/examples.README,examples.Makefile: out of date, removed.
* src/tests/README: details on running tests. * cpp/README: Point to src/tests/README * src/tests/ .valgrind.supp, .valgrindrc-default: moved valgrind options to file, easier to modify locally updated suppressions (see README) * src/tests/test_env, run-unit-tests: more flexible test running (see README) git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@524913 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/run-unit-tests')
-rwxr-xr-xqpid/cpp/src/tests/run-unit-tests21
1 files changed, 5 insertions, 16 deletions
diff --git a/qpid/cpp/src/tests/run-unit-tests b/qpid/cpp/src/tests/run-unit-tests
index f066a38205..a3113b14ee 100755
--- a/qpid/cpp/src/tests/run-unit-tests
+++ b/qpid/cpp/src/tests/run-unit-tests
@@ -11,27 +11,16 @@
#
# Build and run selected tests:
# make check TESTS=run-unit-tests UNIT_TESTS=ClientChannelTest
-#
-
-# Default VALGRIND from the path and $srcdir to . but
-# don't override values set by make.
-test -z "$VALGRIND" -a -z "$MAKEFLAGS" && VALGRIND=`which valgrind` 2>/dev/null
-test -z "$srcdir" && srcdir=.
+#
-rm -f valgrind.out
-vg_log=--log-file-exactly=valgrind.out
-source $srcdir/setup
for u in $* $UNIT_TESTS ; do
case $u in
:*) TEST_ARGS="$TEST_ARGS $u" ;; # A test path.
- *) TEST_ARGS="$TEST_ARGS $pwd/.libs/$u.so" ;; # A test library.
+ *) TEST_ARGS="$TEST_ARGS .libs/$u.so" ;; # A test library.
esac
done
-# If none specified, run all tests in .libs
-test -z "$TEST_ARGS" && TEST_ARGS="$pwd/.libs/*Test.so"
-fail=0
+test -z "$TEST_ARGS" && TEST_ARGS=".libs/*Test.so"
-$vg DllPlugInTester -c -b $TEST_ARGS || fail=1
-vg_check valgrind.out || fail=1
+test -z "$srcdir" && srcdir=.
+exec $srcdir/test_env DllPlugInTester -c -b $TEST_ARGS
-exit $fail