summaryrefslogtreecommitdiff
path: root/qpid/cpp/src/tests/run_test
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2007-11-01 00:38:58 +0000
committerAlan Conway <aconway@apache.org>2007-11-01 00:38:58 +0000
commit6ff9cc1db2af388c9fe00c140f555f7c30c5df6d (patch)
tree0b8e872f26627b5ebdcc882238e9ad256785cd22 /qpid/cpp/src/tests/run_test
parent04cc6a2f5225e8894b4a8173b5a6ffd59a00184d (diff)
downloadqpid-python-6ff9cc1db2af388c9fe00c140f555f7c30c5df6d.tar.gz
Preparation for session thread safety overhaul:
- simplified SessionState, responsibility for protocol states now in Handlers - qpid::RefCounted, qpid::intrusive_ptr reference counting support. - build boost unit tests as single exe, speeds up testing. - fixed leak in AsynchIOAcceptor.cpp git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@590869 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/run_test')
-rwxr-xr-xqpid/cpp/src/tests/run_test16
1 files changed, 9 insertions, 7 deletions
diff --git a/qpid/cpp/src/tests/run_test b/qpid/cpp/src/tests/run_test
index 615e8132f1..0f59509dab 100755
--- a/qpid/cpp/src/tests/run_test
+++ b/qpid/cpp/src/tests/run_test
@@ -21,18 +21,20 @@ export VALGRIND srcdir
# Export QPID_PORT if qpidd.port exists.
test -f qpidd.port && export QPID_PORT=`cat qpidd.port`
+# Avoid silly libtool error messages if these are not defined
+test -z "$LC_ALL" && export LC_ALL=
+test -z "$LC_CTYPE" && export LC_CTYPE=
+test -z "$LC_COLLATE" && export LC_COLLATE=
+test -z "$LC_MESSAGES" && export LC_MESSAGES=
+
VG_LOG="$1.vglog"
-TEST_LOG="$1.log"
-rm -f $VG_LOG $TEST_LOG
+rm -f $VG_LOG
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 --log-file-exactly=$VG_LOG --"
# Hide output unless there's an error.
- libtool --mode=execute $VALGRIND "$@" >$TEST_LOG 2>&1 || {
- ERROR=$?
- cat $TEST_LOG
- }
+ libtool --mode=execute $VALGRIND "$@" 2>&1 || ERROR=$?
test -n "$VALGRIND" && vg_check
else
# This is a non-libtool shell script, just execute it.
@@ -42,7 +44,7 @@ fi
if test -z "$ERROR"; then
# Clean up logs if there was no error.
- rm -f $VG_LOG $TEST_LOG
+ rm -f $VG_LOG
exit 0
else
exit $ERROR