X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=test%2Fudev-test.pl;h=593e34e885600b26f84e8d4251492928f205dc36;hb=16ac31aaee34f1085daf1c43a8645b174712b2d4;hp=c2d8e27a52003ca25e6186a52d6e78b546061b70;hpb=ad89f2be3b045f37b7e17de10f5ad46dbb09664f;p=elogind.git diff --git a/test/udev-test.pl b/test/udev-test.pl index c2d8e27a5..593e34e88 100644 --- a/test/udev-test.pl +++ b/test/udev-test.pl @@ -35,9 +35,6 @@ my $perm = "udev.permissions"; my $main_conf = "udev-test.conf"; my $conf_tmp = "udev-test.rules"; -# uncomment following line to run udev with valgrind. -# Should make this a runtime option to the script someday... -#my $udev_bin = "valgrind --tool=memcheck --leak-check=yes ../udev"; my @tests = ( { @@ -1156,6 +1153,7 @@ $ENV{UDEV_TEST} = "yes"; $ENV{SYSFS_PATH} = $sysfs; $ENV{UDEV_CONFIG_FILE} = $main_conf; $ENV{UDEV_NO_DEVD} = "yes"; +$ENV{UDEV_NO_HOTPLUGD} = "yes"; sub udev { @@ -1262,6 +1260,7 @@ sub run_test { udev("add", $config->{subsys}, $config->{devpath}, \$config->{conf}); + if ((-e "$PWD/$udev_root$config->{exp_name}") || (-l "$PWD/$udev_root$config->{exp_name}")) {