diff options
| author | Mark Wielaard <mjw@redhat.com> | 2014-10-02 22:53:44 +0200 |
|---|---|---|
| committer | Mark Wielaard <mjw@redhat.com> | 2014-10-02 22:58:28 +0200 |
| commit | 281ebd7d5ac10c094b73c6ab812414cd7b891e60 (patch) | |
| tree | 8f7469d23047e96233c6cb82b8de48dafcac0b6d | |
| parent | b50014f56418d9be8eb3d5a86c693a4fda83dc09 (diff) | |
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>
| -rw-r--r-- | tests/ChangeLog | 4 | ||||
| -rwxr-xr-x | tests/run-deleted.sh | 8 |
2 files changed, 12 insertions, 0 deletions
diff --git a/tests/ChangeLog b/tests/ChangeLog index a6111afe..6b762488 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,5 +1,9 @@ 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. (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 b3f17ff4..8c4d928e 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 |