From: Mark Wielaard <mjw@redhat.com>
Date: Thu, 2 Oct 2014 20:53:44 +0000 (+0200)
Subject: tests: run-deleted.sh unset VALGRIND_CMD before running deleted.
X-Git-Tag: elfutils-0.161~104
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=281ebd7d5ac10c094b73c6ab812414cd7b891e60;p=thirdparty%2Felfutils.git

tests: run-deleted.sh unset VALGRIND_CMD before running deleted.

We don't want to run the deleted test process under valgrind then
eu-stack will see the valgrind process backtrace.

Signed-off-by: Mark Wielaard <mjw@redhat.com>
---

diff --git a/tests/ChangeLog b/tests/ChangeLog
index a6111afee..6b7624882 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-02  Mark Wielaard  <mjw@redhat.com>
+
+	* run-deleted.sh: Unset VALGRIND_CMD before running deleted.
+
 2014-10-02  Mark Wielaard  <mjw@redhat.com>
 
 	* Makefile.am (check_PROGRAMS): Add aggregate_size.c.
diff --git a/tests/run-deleted.sh b/tests/run-deleted.sh
index b3f17ff42..8c4d928e4 100755
--- a/tests/run-deleted.sh
+++ b/tests/run-deleted.sh
@@ -19,10 +19,18 @@
 
 tempfiles deleted deleted-lib.so
 cp -p ${abs_builddir}/deleted ${abs_builddir}/deleted-lib.so .
+
+# We don't want to run the deleted process under valgrind then
+# stack will see the valgrind process backtrace.
+OLD_VALGRIND_CMD="$VALGRIND_CMD"
+unset VALGRIND_CMD
+
 pid=$(testrun ${abs_builddir}/deleted)
 sleep 1
 rm -f deleted deleted-lib.so
 tempfiles bt
+
+set VALGRIND_CMD="$OLD_VALGRIND_CMD"
 # It may have non-zero exit code with:
 # .../elfutils/src/stack: dwfl_thread_getframes tid 26376 at 0x4006c8 in .../elfutils/tests/deleted: no matching address range
 testrun ${abs_top_builddir}/src/stack -p $pid >bt || true