diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2014-03-08 23:19:26 +0100 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2014-03-10 12:24:11 +0100 |
| commit | 5dc9402774efb99ffea95d7f5435f36d68aa5077 (patch) | |
| tree | 96aa8f88ce99f692d9bbec98e1ee9205d4c5e607 | |
| parent | c7262d5b383091e874d5a00ac266819b5eda649b (diff) | |
| download | lvm2-5dc9402774efb99ffea95d7f5435f36d68aa5077.tar.gz | |
tests: dmeventd valgrind testing
| -rw-r--r-- | test/lib/aux.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/test/lib/aux.sh b/test/lib/aux.sh index 4b4662c41..53d0fc7c8 100644 --- a/test/lib/aux.sh +++ b/test/lib/aux.sh @@ -62,11 +62,14 @@ prepare_dmeventd() { lvmconf "activation/monitoring = 1" - dmeventd -f "$@" & + local run_valgrind= + test "${LVM_VALGRIND_DMEVENTD:-0}" -eq 0 || run_valgrind="run_valgrind" + $run_valgrind dmeventd -f "$@" & echo $! > LOCAL_DMEVENTD # FIXME wait for pipe in /var/run instead - sleep .3 + while ! test -e "/var/run/dmeventd.pid"; do echo -n .; sleep .2; done # wait for the socket + echo ok } prepare_lvmetad() { @@ -217,8 +220,7 @@ teardown() { echo -n . - pgrep dmeventd || true - test ! -s LOCAL_DMEVENTD || kill -9 "$(cat LOCAL_DMEVENTD)" || true + kill_sleep_kill_ LOCAL_DMEVENTD ${LVM_VALGRIND_DMEVENTD:-0} echo -n . |