X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=test%2Fudev-test.pl;h=4c6a70f1afe8df51acd72c34856a9ed6b223ff8a;hb=c28c4486af3fd970aef599be65e9c2d424765329;hp=576173b40aedfd481b111cfa524010b8450f2592;hpb=f2041f0116fcfb05293f2bd5e225a80f27a28c41;p=elogind.git

diff --git a/test/udev-test.pl b/test/udev-test.pl
index 576173b40..4c6a70f1a 100755
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -610,7 +610,7 @@ EOF
 	{
 		desc		=> "permissions USER=bad GROUP=name",
 		subsys		=> "tty",
-		devpath		=> "/class/tty/tty33",
+		devpath		=> "/devices/virtual/tty/tty33",
 		exp_name	=> "tty33",
 		exp_perms	=> "0:0:0660",
 		rules		=> <<EOF
@@ -885,7 +885,7 @@ EOF
 	{
 		desc		=> "symlink node to itself",
 		subsys		=> "tty",
-		devpath		=> "/class/tty/tty0",
+		devpath		=> "/devices/virtual/tty/tty0",
 		exp_name	=> "link",
 		exp_target	=> "link",
 		exp_add_error	=> "yes",
@@ -1195,6 +1195,7 @@ EOF
 		devpath		=> "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1",
 		exp_name	=> "true",
 		rules		=> <<EOF
+ENV{ENV_KEY_TEST}="test"
 SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ENV_KEY_TEST}=="go", NAME="wrong"
 SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ENV_KEY_TEST}=="test", NAME="true"
 SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ENV_KEY_TEST}=="bad", NAME="bad"
@@ -1206,6 +1207,7 @@ EOF
 		devpath		=> "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1",
 		exp_name	=> "true",
 		rules		=> <<EOF
+ENV{ENV_KEY_TEST}="test"
 SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ENV_KEY_TEST}=="go", NAME="wrong"
 SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ENV_KEY_TEST}=="yes", ENV{ACTION}=="add", ENV{DEVPATH}=="/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sdax1", NAME="no"
 SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ENV_KEY_TEST}=="test", ENV{ACTION}=="add", ENV{DEVPATH}=="/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", NAME="true"
@@ -1620,7 +1622,6 @@ EOF
 );
 
 # set env
-$ENV{ENV_KEY_TEST} = "test";
 $ENV{SYSFS_PATH} = $sysfs;
 $ENV{UDEV_CONFIG_FILE} = $udev_conf;
 
@@ -1635,10 +1636,11 @@ sub udev {
 	close CONF;
 
 	$ENV{ACTION} = $action;
+	$ENV{SUBSYSTEM} = $subsys;
 	if ($valgrind > 0) {
-		system("$udev_bin_valgrind $subsys");
+		system("$udev_bin_valgrind");
 	} else {
-		system("$udev_bin $subsys");
+		system("$udev_bin");
 	}
 }