From 3badde0ceb6536078dd005508d77b546e7caeeb4 Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Tue, 9 Apr 2013 23:58:41 -0700 Subject: testing: apply valgrind to EDS when running test-dbus.py and testpim.py When starting a D-Bus session for test-dbus.py and testpim.py, valgrind gets injected via an env variable and the older check of the program to be started did not match. Need to check the environment in addition to the command line, otherwise EDS gets started by the D-Bus daemon and we never see its output nor does it get checked by valgrind. --- test/dbus-session.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/dbus-session.sh b/test/dbus-session.sh index a753b708..6e2290ab 100755 --- a/test/dbus-session.sh +++ b/test/dbus-session.sh @@ -42,6 +42,8 @@ case "$@" in *valgrind*) prefix=`echo $@ | perl -p -e 's;.*?(\S*/?valgrind\S*).* *setup-syncevolution.sh*|*syncevolution\ *|*client-test\ *|*bash*|*testpim.py\ *|*test-dbus.py\ *|*gdb\ *) prefix=env;; *) prefix=;; # don't start EDS esac +case "$TEST_DBUS_PREFIX" in *valgrind*) prefix="$TEST_DBUS_PREFIX";; +esac akonadi=$prefix case "$@" in *test-dbus.py\ *) akonadi=;; esac -- cgit v1.2.3