X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=test%2Fudev-test.pl;h=30e8d2ac1088447c120e27b994a6ccee667fa81c;hb=065db052211d3bf08d9b0f698a79a8798faf11d2;hp=4f61ce3e5ddf0b40fda8c928032f1ffeccf26693;hpb=a402404fb23195839a9e008dbbe5edb5349c05b0;p=elogind.git

diff --git a/test/udev-test.pl b/test/udev-test.pl
index 4f61ce3e5..30e8d2ac1 100755
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -281,15 +281,6 @@ EOF
 		exp_name	=> "Major:8:minor:5:kernelnumber:5:id:0:0:0:0" ,
 		rules		=> <<EOF
 SUBSYSTEMS=="scsi", KERNELS=="0:0:0:0", NAME="Major:%M:minor:%m:kernelnumber:%n:id:%b"
-EOF
-	},
-	{
-		desc		=> "test substitution chars (with length limit)",
-		subsys		=> "block",
-		devpath		=> "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5",
-		exp_name	=> "M8-m5-n5-b0:0-xAT" ,
-		rules		=> <<EOF
-SUBSYSTEMS=="scsi", KERNELS=="0:0:0:0", NAME="M%M-m%m-n%n-b%3b-x%2s{vendor}"
 EOF
 	},
 	{
@@ -351,15 +342,6 @@ EOF
 		exp_name	=> "test-0:0:0:0" ,
 		rules		=> <<EOF
 SUBSYSTEMS=="scsi", PROGRAM=="/bin/echo -n test-%b", RESULT=="test-0:0*", NAME="%c"
-EOF
-	},
-	{
-		desc		=> "program with escaped format char (tricky: callout returns format char!)",
-		subsys		=> "block",
-		devpath		=> "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5",
-		exp_name	=> "escape-5" ,
-		rules		=> <<EOF
-SUBSYSTEMS=="scsi", PROGRAM=="/bin/echo -n escape-%%n", KERNEL=="sda5", NAME="%c"
 EOF
 	},
 	{
@@ -1019,16 +1001,6 @@ EOF
 		exp_target	=> "ttyACM0",
 		rules		=> <<EOF
 KERNEL=="ttyACM[0-9]*", NAME="ttyACM%n", SYMLINK+="%s{dev}"
-EOF
-	},
-	{
-		desc		=> "symlink %Ns{filename} substitution",
-		subsys		=> "tty",
-		devpath		=> "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
-		exp_name	=> "166",
-		exp_target	=> "ttyACM0",
-		rules		=> <<EOF
-KERNEL=="ttyACM[0-9]*", NAME="ttyACM%n", SYMLINK+="%3s{dev}"
 EOF
 	},
 	{
@@ -1554,6 +1526,17 @@ KERNEL=="sda1", GOTO="BAD"
 KERNEL=="sda1", NAME="", LABEL="NO"
 KERNEL=="sda1", NAME="right", LABEL="TEST"
 KERNEL=="sda1", LABEL="BAD"
+EOF
+	},
+	{
+		desc		=> "GOTO label does not exist",
+		subsys		=> "block",
+		devpath		=> "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1",
+		exp_name	=> "right",
+		rules		=> <<EOF
+KERNEL=="sda1", GOTO="does-not-exist"
+KERNEL=="sda1", NAME="right",
+LABEL="exists"
 EOF
 	},
 	{