chiark / gitweb /
build-sys: place build binaries in the root
[elogind.git] / test / udev-test.pl
index 0d30a2c47c6e21f2569b7927dcdb0daa5d427010..0b379b0d9a708e61de7bc625dbe3b212b1886e0f 100755 (executable)
@@ -22,7 +22,7 @@ use strict;
 
 my $PWD                 = $ENV{PWD};
 my $sysfs               = "test/sys";
-my $udev_bin            = "src/test-udev";
+my $udev_bin            = "./test-udev";
 my $valgrind            = 0;
 my $udev_bin_valgrind   = "valgrind --tool=memcheck --leak-check=yes --quiet $udev_bin";
 my $udev_root           = "udev-root";
@@ -44,7 +44,7 @@ EOF
                 devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
                 exp_name        => "boot_disk" ,
                 rules           => <<EOF
-SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", SYMLINK+="boot_disk%n", RUN+="socket:@/org/kernel/udev/monitor"
+SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", SYMLINK+="boot_disk%n"
 KERNEL=="ttyACM0", SYMLINK+="modem"
 EOF
         },
@@ -1319,7 +1319,7 @@ EOF
                 rules           => <<EOF
 KERNEL=="sda", PROGRAM="/bin/true create-envp"
 KERNEL=="sda", ENV{TESTENV}="change-envp"
-KERNEL=="sda", SYMLINK+="%k-%s{[dmi/id]product_name}-end", RUN+="socket:@/org/kernel/udev/monitor"
+KERNEL=="sda", SYMLINK+="%k-%s{[dmi/id]product_name}-end"
 EOF
         },
         {
@@ -1492,7 +1492,7 @@ sub run_test {
         print "\n";
 
         if (defined($rules->{option}) && $rules->{option} eq "clean") {
-                make_udev_root ();
+                make_udev_root();
         }
 
 }