[COMMITTED] tests: run-deleted.sh unset VALGRIND_CMD before running deleted.

Mark Wielaard mjw at redhat.com
Thu Oct 2 20:56:56 UTC 2014


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 at redhat.com>
---
 tests/ChangeLog      | 4 ++++
 tests/run-deleted.sh | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/tests/ChangeLog b/tests/ChangeLog
index a6111af..6b76248 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,5 +1,9 @@
 2014-10-02  Mark Wielaard  <mjw at redhat.com>
 
+	* run-deleted.sh: Unset VALGRIND_CMD before running deleted.
+
+2014-10-02  Mark Wielaard  <mjw at redhat.com>
+
 	* Makefile.am (check_PROGRAMS): Add aggregate_size.c.
 	(TESTS): Add run-aggregate-size.sh.
 	(EXTRA_DIST): Add run-aggregate-size.sh, testfile-sizes1.o.bz2
diff --git a/tests/run-deleted.sh b/tests/run-deleted.sh
index b3f17ff..8c4d928 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
-- 
1.8.3.1



More information about the elfutils-devel mailing list