diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2013-10-24 15:00:11 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2013-10-24 15:00:11 +0000 |
| commit | 96cb698658efdadeaa97b6f896d270fc04330822 (patch) | |
| tree | 71b07c8e906b3808fa848def0f52117b6386feee /qpid/cpp/src/tests/test_env.sh.in | |
| parent | 9dffceae68b8d8bc36a2de08abcbd8554db3e309 (diff) | |
| download | qpid-python-96cb698658efdadeaa97b6f896d270fc04330822.tar.gz | |
QPID-4927: Get cmake testing working with valgrind
[also remove unused files]
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1535398 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/test_env.sh.in')
| -rw-r--r-- | qpid/cpp/src/tests/test_env.sh.in | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/qpid/cpp/src/tests/test_env.sh.in b/qpid/cpp/src/tests/test_env.sh.in index f45d3708a2..c85e1d651a 100644 --- a/qpid/cpp/src/tests/test_env.sh.in +++ b/qpid/cpp/src/tests/test_env.sh.in @@ -19,7 +19,7 @@ absdir() { echo `cd $1 && pwd`; } -# Environment variables substituted by configure/cmake. +# Environment variables substituted by cmake. srcdir=`absdir @abs_srcdir@` builddir=`absdir @abs_builddir@` top_srcdir=`absdir @abs_top_srcdir@` @@ -30,6 +30,12 @@ pythonswiglibdir=$top_builddir/bindings/qpid/python@builddir_lib_suffix@ testmoduledir=$builddir@builddir_lib_suffix@ export QPID_INSTALL_PREFIX=@prefix@ +# Tools substituted by cmake +enable_valgrind=${enable_valgrind-@ENABLE_VALGRIND@} +if [ "$enable_valgrind" = "ON" ] ; then + export VALGRIND=@VALGRIND_EXECUTABLE@ +fi + # Python paths and directories export PYTHON_DIR=$builddir/python export QPID_PYTHON_TEST=$PYTHON_DIR/commands/qpid-python-test |