diff options
| author | Alan Conway <aconway@apache.org> | 2008-06-20 21:23:23 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2008-06-20 21:23:23 +0000 |
| commit | d843260b5ca7b8945144c27e584777c9b6da276a (patch) | |
| tree | 74e36abc6518fccd631057cbdb991d7680b8e00d /qpid/cpp/src/tests/run_test | |
| parent | e34a577698e195c576d168480dafcc524e41fa24 (diff) | |
| download | qpid-python-d843260b5ca7b8945144c27e584777c9b6da276a.tar.gz | |
Patch from Manuel Teira: https://issues.apache.org/jira/secure/CommentAssignIssue!default.jspa?action=5&id=12398038
- Use standard automake makefiles to build cpp/examples.
- Rationalize examples directory structure.
Additions to patch:
- Fix for VPATH builds.
- Fix make distcheck (finally!)
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@670066 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/run_test')
| -rwxr-xr-x | qpid/cpp/src/tests/run_test | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/qpid/cpp/src/tests/run_test b/qpid/cpp/src/tests/run_test index 08bf845ba1..c535c8caaa 100755 --- a/qpid/cpp/src/tests/run_test +++ b/qpid/cpp/src/tests/run_test @@ -14,34 +14,42 @@ srcdir=`dirname $0` source $srcdir/vg_check -test -f .valgrindrc || cp $srcdir/.valgrindrc . -test -f .valgrind.supp || cp $srcdir/.valgrind.supp . - # Export variables from makefile. export VALGRIND srcdir -# Export QPID_PORT if qpidd.port exists. -test -f qpidd.port && export QPID_PORT=`cat qpidd.port` +# Set QPID_PORT if qpidd.port exists. +test -f qpidd.port && QPID_PORT=`cat qpidd.port` +export QPID_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= +test -z "$LC_ALL" && LC_ALL= +test -z "$LC_CTYPE" && LC_CTYPE= +test -z "$LC_COLLATE" && LC_COLLATE= +test -z "$LC_MESSAGES" && LC_MESSAGES= +export LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES VG_LOG="$1.vglog" rm -f $VG_LOG* +VALGRIND_OPTS=" +--gen-suppressions=all +--leak-check=full +--demangle=yes +--suppressions=$srcdir/.valgrind.supp +--num-callers=25 +--trace-children=yes +--log-file=$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=$VG_LOG --" + test -n "$VALGRIND" && VALGRIND="$VALGRIND $VALGRIND_OPTS" # Hide output unless there's an error. libtool --mode=execute $VALGRIND "$@" 2>&1 || ERROR=$? test -n "$VALGRIND" && vg_check $VG_LOG* else # This is a non-libtool shell script, just execute it. - export VALGRIND srcdir exec "$@" fi |