X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=test%2Fudev-test.pl;h=243e9619db4a155796526d72010e3e48a000a18b;hb=cb25a9585d87d8dd13d9eae66fd232e3dfdc8fac;hp=df5e3fcb2a7d0329611d5140ffb467d816b4ed9e;hpb=5c0f595d91a21b1fba2b9edd89511a072036d0e8;p=elogind.git

diff --git a/test/udev-test.pl b/test/udev-test.pl
index df5e3fcb2..243e9619d 100755
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -92,7 +92,7 @@ SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", ATTRS{model}=="ST910021AS", NAME="boot
 EOF
 	},
 	{
-		desc		=> "label test of max sysfs files",
+		desc		=> "label test of max sysfs files (skip invalid rule)",
 		subsys		=> "block",
 		devpath		=> "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1",
 		exp_name	=> "boot_disk1" ,
@@ -230,7 +230,7 @@ EOF
 #
 \\
 
-\\\\
+\\
 
 #\\
 
@@ -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"
@@ -1247,7 +1249,7 @@ SUBSYSTEM=="block", KERNEL=="*[0-9]", ENV{PARTITION}="true", ENV{MAINDEVICE}="fa
 SUBSYSTEM=="block", KERNEL=="*[!0-9]", ENV{PARTITION}="false", ENV{MAINDEVICE}="true"
 ENV{MAINDEVICE}=="true", NAME="disk"
 ENV{PARTITION}=="true", NAME="part"
-NAME="bad"
+SUBSYSTEM=="block", NAME="bad"
 EOF
 	},
 	{
@@ -1363,20 +1365,20 @@ EOF
 		subsys		=> "block",
 		devpath		=> "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
 		exp_name	=> "ok",
-		exp_perms	=> "root:nobody:0640",
+		exp_perms	=> "root:tty:0640",
 		rules		=> <<EOF
-KERNEL=="sda", GROUP:="nobody"
+KERNEL=="sda", GROUP:="tty"
 KERNEL=="sda", GROUP="not-ok", MODE="0640", NAME="ok"
 EOF
 	},
 	{
-		desc		=> "final assignment",
+		desc		=> "final assignment 2",
 		subsys		=> "block",
 		devpath		=> "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
 		exp_name	=> "ok",
-		exp_perms	=> "root:nobody:0640",
+		exp_perms	=> "root:tty:0640",
 		rules		=> <<EOF
-KERNEL=="sda", GROUP:="nobody"
+KERNEL=="sda", GROUP:="tty"
 SUBSYSTEM=="block", MODE:="640"
 KERNEL=="sda", GROUP="not-ok", MODE="0666", NAME="ok"
 EOF
@@ -1535,8 +1537,8 @@ EOF
 		exp_name	=> "yes",
 		rules		=> <<EOF
 # 012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
-   # 012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
-KERNEL="sda1", NAME=="no"
+   # 012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
+KERNEL=="sda1", NAME=="no"
 KERNEL=="sda1", NAME="yes"
 EOF
 	},
@@ -1556,7 +1558,17 @@ EOF
 		exp_name	=> "there",
 		rules		=> <<EOF
 TEST=="/etc/hosts", NAME="there"
-NAME="notthere"
+TEST!="/etc/hosts", NAME="notthere"
+EOF
+	},
+	{
+		desc		=> "TEST invalid NAME= only (skip invalid rule)",
+		subsys		=> "block",
+		devpath		=> "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
+		exp_name	=> "yes",
+		rules		=> <<EOF
+SUBSYSTEM=="block", NAME="yes"
+NAME="no"
 EOF
 	},
 	{
@@ -1620,7 +1632,6 @@ EOF
 );
 
 # set env
-$ENV{ENV_KEY_TEST} = "test";
 $ENV{SYSFS_PATH} = $sysfs;
 $ENV{UDEV_CONFIG_FILE} = $udev_conf;
 
@@ -1635,10 +1646,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");
 	}
 }