X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=test%2Fudev-test.pl;h=9a88d062715cc823f6c62956bdeb58af5f3a151e;hp=c33c79b1c096adbe0793748484235da3a197a406;hb=c8ff4b3db440f1c3124b0e4e4efc68f1177c5964;hpb=fc55cf68ca0c0db5172a9de7e827c6c3f7c2a308

diff --git a/test/udev-test.pl b/test/udev-test.pl
index c33c79b1c..9a88d0627 100755
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -231,7 +231,7 @@ KERNEL=="ttyUSB0", NAME="sub/direct/ory/visor"
 EOF
 	},
 	{
-		desc		=> "place on bus of scsi partition",
+		desc		=> "parent device name match of scsi partition",
 		subsys		=> "block",
 		devpath		=> "/block/sda/sda3",
 		exp_name	=> "first_disk3" ,
@@ -243,9 +243,9 @@ EOF
 		desc		=> "test substitution chars",
 		subsys		=> "block",
 		devpath		=> "/block/sda/sda3",
-		exp_name	=> "Major:8:minor:3:kernelnumber:3:bus:0:0:0:0" ,
+		exp_name	=> "Major:8:minor:3:kernelnumber:3:id:0:0:0:0" ,
 		rules		=> <<EOF
-BUS=="scsi", ID=="0:0:0:0", NAME="Major:%M:minor:%m:kernelnumber:%n:bus:%b"
+BUS=="scsi", ID=="0:0:0:0", NAME="Major:%M:minor:%m:kernelnumber:%n:id:%b"
 EOF
 	},
 	{
@@ -298,15 +298,6 @@ BUS=="scsi", PROGRAM=="/bin/echo -n special-device", RESULT=="special--*", NAME=
 BUS=="scsi", PROGRAM=="/bin/echo -n special-device", RESULT=="special-device-", NAME="%c-3-%n"
 BUS=="scsi", PROGRAM=="/bin/echo -n special-device", RESULT=="special-devic", NAME="%c-4-%n"
 BUS=="scsi", PROGRAM=="/bin/echo -n special-device", RESULT=="special-*", NAME="%c-%n"
-EOF
-	},
-	{
-		desc		=> "program result substitution (no argument should be subsystem)",
-		subsys		=> "block",
-		devpath		=> "/block/sda/sda3",
-		exp_name	=> "subsys_block" ,
-		rules		=> <<EOF
-BUS=="scsi", PROGRAM=="/bin/echo", RESULT=="block", NAME="subsys_block"
 EOF
 	},
 	{
@@ -385,18 +376,18 @@ EOF
 		desc		=> "test substitution by variable name",
 		subsys		=> "block",
 		devpath		=> "/block/sda/sda3",
-		exp_name	=> "Major:8-minor:3-kernelnumber:3-bus:0:0:0:0" ,
+		exp_name	=> "Major:8-minor:3-kernelnumber:3-id:0:0:0:0",
 		rules		=> <<EOF
-BUS=="scsi", ID=="0:0:0:0", NAME="Major:\$major-minor:\$minor-kernelnumber:\$number-bus:\$id"
+BUS=="scsi", ID=="0:0:0:0", NAME="Major:\$major-minor:\$minor-kernelnumber:\$number-id:\$id"
 EOF
 	},
 	{
 		desc		=> "test substitution by variable name 2",
 		subsys		=> "block",
 		devpath		=> "/block/sda/sda3",
-		exp_name	=> "Major:8-minor:3-kernelnumber:3-bus:0:0:0:0" ,
+		exp_name	=> "Major:8-minor:3-kernelnumber:3-id:0:0:0:0",
 		rules		=> <<EOF
-BUS=="scsi", ID=="0:0:0:0", DEVPATH="*/sda/*", NAME="Major:\$major-minor:%m-kernelnumber:\$number-bus:%b"
+BUS=="scsi", ID=="0:0:0:0", DEVPATH=="*/sda/*", NAME="Major:\$major-minor:%m-kernelnumber:\$number-id:\$id"
 EOF
 	},
 	{
@@ -405,7 +396,7 @@ EOF
 		devpath		=> "/block/sda/sda3",
 		exp_name	=> "830:0:0:03" ,
 		rules		=> <<EOF
-BUS=="scsi", ID=="0:0:0:0", DEVPATH="*/sda/*", NAME="%M%m%b%n"
+BUS=="scsi", ID=="0:0:0:0", DEVPATH=="*/sda/*", NAME="%M%m%b%n"
 EOF
 	},
 	{
@@ -414,7 +405,7 @@ EOF
 		devpath		=> "/block/sda/sda3",
 		exp_name	=> "833" ,
 		rules		=> <<EOF
-BUS=="scsi", ID=="0:0:0:0", DEVPATH="*/sda/*", NAME="\$major\$minor\$number"
+BUS=="scsi", ID=="0:0:0:0", DEVPATH=="*/sda/*", NAME="\$major\$minor\$number"
 EOF
 	},
 	{
@@ -423,31 +414,21 @@ EOF
 		devpath		=> "/block/sda/sda3",
 		exp_name	=> "8330:0:0:0" ,
 		rules		=> <<EOF
-BUS=="scsi", ID=="0:0:0:0", DEVPATH="*/sda/*", NAME="\$major%m%n\$id"
+BUS=="scsi", ID=="0:0:0:0", DEVPATH=="*/sda/*", NAME="\$major%m%n\$id"
 EOF
 	},
 	{
-		desc		=> "invalid program for device with no bus",
+		desc		=> "non matching BUS for device with no parent",
 		subsys		=> "tty",
 		devpath		=> "/class/tty/console",
-		exp_name	=> "TTY" ,
+		exp_name	=> "TTY",
 		rules		=> <<EOF
 BUS=="scsi", PROGRAM=="/bin/echo -n foo", RESULT=="foo", NAME="foo"
 KERNEL=="console", NAME="TTY"
 EOF
 	},
 	{
-		desc		=> "valid program for device with no bus",
-		subsys		=> "tty",
-		devpath		=> "/class/tty/console",
-		exp_name	=> "foo" ,
-		rules		=> <<EOF
-PROGRAM=="/bin/echo -n foo", RESULT=="foo", NAME="foo"
-KERNEL=="console", NAME="TTY"
-EOF
-	},
-	{
-		desc		=> "invalid label for device with no bus",
+		desc		=> "non matching BUS",
 		subsys		=> "tty",
 		devpath		=> "/class/tty/console",
 		exp_name	=> "TTY" ,
@@ -457,7 +438,7 @@ KERNEL=="console", NAME="TTY"
 EOF
 	},
 	{
-		desc		=> "valid label for device with no bus",
+		desc		=> "SYSFS match",
 		subsys		=> "tty",
 		devpath		=> "/class/tty/console",
 		exp_name	=> "foo" ,
@@ -881,6 +862,7 @@ EOF
 		devpath		=> "/class/tty/tty0",
 		exp_name	=> "link",
 		exp_target	=> "link",
+		exp_add_error	=> "yes",
 		exp_rem_error	=> "yes",
 		option		=> "clean",
 		rules		=> <<EOF
@@ -1026,74 +1008,6 @@ EOF
 		exp_target	=> "node",
 		rules		=> <<EOF
 BUS=="scsi", PROGRAM=="/bin/echo -n node link1 link2 link3 link4", RESULT=="node *", NAME="%c{1}", SYMLINK+="%c{2+}"
-EOF
-	},
-	{
-		desc		=> "enumeration char test (single test)",
-		subsys		=> "block",
-		devpath		=> "/block/sda",
-		exp_name	=> "cdrom",
-		rules		=> <<EOF
-KERNEL=="sda", NAME="cdrom%e"
-EOF
-	},
-	{
-		desc		=> "enumeration char test sequence 1/5 (keep)",
-		subsys		=> "block",
-		devpath		=> "/block/sda",
-		exp_name	=> "cdrom",
-		option		=> "keep",
-		rules		=> <<EOF
-KERNEL=="sda", NAME="cdrom%e"
-EOF
-	},
-	{
-		desc		=> "enumeration char test sequence 2/5 (keep)",
-		subsys		=> "block",
-		devpath		=> "/block/sda/sda1",
-		exp_name	=> "enum",
-		option		=> "keep",
-		rules		=> <<EOF
-KERNEL=="sda1", NAME="enum%e"
-EOF
-	},
-	{
-		desc		=> "enumeration char test sequence 3/5 (keep)",
-		subsys		=> "block",
-		devpath		=> "/block/sda/sda2",
-		exp_name	=> "cdrom1",
-		option		=> "keep",
-		rules		=> <<EOF
-KERNEL=="sda2", NAME="cdrom%e"
-EOF
-	},
-	{
-		desc		=> "enumeration char test sequence 4/5 (keep)",
-		subsys		=> "block",
-		devpath		=> "/block/sda/sda3",
-		exp_name	=> "enum1",
-		option		=> "keep",
-		rules		=> <<EOF
-KERNEL=="sda3", NAME="enum%e"
-EOF
-	},
-	{
-		desc		=> "enumeration char test sequence 5/5 (clean)",
-		subsys		=> "block",
-		devpath		=> "/block/sda/sda4",
-		exp_name	=> "cdrom2",
-		option		=> "clean",
-		rules		=> <<EOF
-KERNEL=="sda4", NAME="cdrom%e"
-EOF
-	},
-	{
-		desc		=> "enumeration char test after cleanup (single test)",
-		subsys		=> "block",
-		devpath		=> "/block/sda",
-		exp_name	=> "cdrom",
-		rules		=> <<EOF
-KERNEL=="sda", NAME="cdrom%e"
 EOF
 	},
 	{
@@ -1310,8 +1224,8 @@ EOF
 		devpath		=> "/block/sda/sda1",
 		exp_name	=> "part",
 		rules		=> <<EOF
-SUBSYSTEM=="block", KERNEL="*[0-9]", ENV{PARTITION}="true", ENV{MAINDEVICE}="false"
-SUBSYSTEM=="block", KERNEL="*[!0-9]", ENV{PARTITION}="false", ENV{MAINDEVICE}="true"
+SUBSYSTEM=="block", KERNEL=="*[0-9]", ENV{PARTITION}="true", ENV{MAINDEVICE}="false"
+SUBSYSTEM=="block", KERNEL=="*[!0-9]", ENV{PARTITION}="false", ENV{MAINDEVICE}="true"
 ENV{MAINDEVICE}=="true", NAME="disk"
 ENV{PARTITION}=="true", NAME="part"
 NAME="bad"
@@ -1547,6 +1461,43 @@ KERNEL=="sda1", NAME="wrong"
 KERNEL=="sda1", NAME="", LABEL="NO"
 KERNEL=="sda1", NAME="right", LABEL="TEST"
 KERNEL=="sda1", NAME="wrong2"
+EOF
+	},
+	{
+		desc		=> "NAME compare test",
+		subsys		=> "block",
+		devpath		=> "/block/sda/sda1",
+		exp_name	=> "link",
+		exp_target	=> "node",
+		not_exp_name	=> "wronglink",
+		rules		=> <<EOF
+KERNEL=="sda1", NAME="node"
+KERNEL=="sda2", NAME="wrong"
+KERNEL=="sda1", NAME=="wrong*", SYMLINK+="wronglink"
+KERNEL=="sda1", NAME=="?*", SYMLINK+="link"
+KERNEL=="sda1", NAME=="node*", SYMLINK+="link2"
+EOF
+	},
+	{
+		desc		=> "NAME compare test 2",
+		subsys		=> "block",
+		devpath		=> "/block/sda/sda1",
+		exp_name	=> "link2",
+		exp_target	=> "sda1",
+		not_exp_name	=> "link",
+		rules		=> <<EOF
+KERNEL=="sda1", NAME=="?*", SYMLINK+="link"
+KERNEL=="sda1", NAME!="?*", SYMLINK+="link2"
+EOF
+	},
+	{
+		desc		=> "invalid key operation",
+		subsys		=> "block",
+		devpath		=> "/block/sda/sda1",
+		exp_name	=> "yes",
+		rules		=> <<EOF
+KERNEL="sda1", NAME=="no"
+KERNEL=="sda1", NAME="yes"
 EOF
 	},
 );