diff options
Diffstat (limited to 'cpp/src/tests/run_test')
| -rwxr-xr-x | cpp/src/tests/run_test | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/cpp/src/tests/run_test b/cpp/src/tests/run_test index 615e8132f1..0f59509dab 100755 --- a/cpp/src/tests/run_test +++ b/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 |