diff options
| author | Ondrej Kozina <okozina@redhat.com> | 2015-01-27 09:57:08 +0100 |
|---|---|---|
| committer | Ondrej Kozina <okozina@redhat.com> | 2015-04-01 11:01:21 +0200 |
| commit | 9a434b9d3b4b71949a95d6e47eaf3e7221226b8b (patch) | |
| tree | 77d8eaad93e236bbd2d7bc76b531061f578e4728 | |
| parent | d5bf478fe21f16607ece4a2039e8006c2de58e98 (diff) | |
| download | lvm2-9a434b9d3b4b71949a95d6e47eaf3e7221226b8b.tar.gz | |
lvmpolld: alter tests wrt previous commit
| -rw-r--r-- | daemons/lvmpolld/lvmpolld-core.c | 2 | ||||
| -rw-r--r-- | test/lib/aux.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/daemons/lvmpolld/lvmpolld-core.c b/daemons/lvmpolld/lvmpolld-core.c index c65de23b8..e9c28636a 100644 --- a/daemons/lvmpolld/lvmpolld-core.c +++ b/daemons/lvmpolld/lvmpolld-core.c @@ -750,7 +750,7 @@ int main(int argc, char *argv[]) }; // use getopt_long - while ((opt = getopt(argc, argv, "?fhVl:p:s:U:")) != EOF) { + while ((opt = getopt(argc, argv, "?fhVl:p:s:B:")) != EOF) { switch (opt) { case 'h': usage(argv[0], stdout); diff --git a/test/lib/aux.sh b/test/lib/aux.sh index 11179f341..1acd0f8d8 100644 --- a/test/lib/aux.sh +++ b/test/lib/aux.sh @@ -139,7 +139,7 @@ prepare_lvmpolld() { test "${LVM_VALGRIND_LVMPOLLD:-0}" -eq 0 || run_valgrind="run_valgrind" echo "preparing lvmpolld..." - $run_valgrind lvmpolld -f "$@" -s "$TESTDIR/lvmpolld.socket" -U "$TESTDIR/lib" -l all,debug & + $run_valgrind lvmpolld -f "$@" -s "$TESTDIR/lvmpolld.socket" -B "$TESTDIR/lib/lvm" -l all,debug & echo $! > LOCAL_LVMPOLLD while ! test -e "$TESTDIR/lvmpolld.socket"; do echo -n .; sleep .1; done # wait for the socket echo ok |