make udev teardown conditional on using udev

diff --git a/test/lib/aux.sh b/test/lib/aux.sh
index 9ad6281697d34d71e44b13945177e2f08c32e485..6f671855d252ff0f570047153d4d92c0ad8456be 100644 (file)
--- a/test/lib/aux.sh
+++ b/test/lib/aux.sh
@@ -62,7 +62,7 @@ prepare_dmeventd() {
 
 teardown_devs() {
        # Delete any remaining dm/udev semaphores
-       dmsetup udevcomplete_all -y
+       teardown_udev_cookies
 
        test -n "$PREFIX" && {
                rm -rf $TESTDIR/dev/$PREFIX*

diff --git a/test/lib/utils.sh b/test/lib/utils.sh
index ee04fa2d65f16b419eebc1ca136001df44771b4b..b2a7af6eb2b2a8bd0d07fc297ed122bdb7ec8c43 100644 (file)
--- a/test/lib/utils.sh
+++ b/test/lib/utils.sh
@@ -147,6 +147,12 @@ finish_udev_transaction() {
     fi
 }
 
+teardown_udev_cookies() {
+    if test "$DM_UDEV_SYNCHRONISATION" = 1; then
+       dmsetup udevcomplete_all -y
+    fi
+}
+
 skip() {
     touch SKIP_THIS_TEST
     exit 200