X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=test%2Fudev-test.pl;h=6b7f515442531b102b29f80164637a9edcd8fef9;hp=e238c909fa77358f925faad1e38d7c3171f44615;hb=63ead27c228f9306f175b14a49df2415d09ece10;hpb=16378373cb9d96e5d424921806ff71f218e92694

diff --git a/test/udev-test.pl b/test/udev-test.pl
index e238c909f..6b7f51544 100644
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -194,13 +194,21 @@ BUS="scsi", PLACE="0:0:0:0", NAME="Major:%M:minor:%m:kernelnumber:%n:bus:%b"
 EOF
 	},
 	{
-		desc     => "select sysfs attribute by SYSFS{vendor}",
+		desc     => "test NAME substitution chars (with length limit)",
+		subsys   => "block",
+		devpath  => "block/sda/sda3",
+		expected => "M8-m3-n3-b0:0-sIBM" ,
+		conf     => <<EOF
+BUS="scsi", PLACE="0:0:0:0", NAME="M%M-m%m-n%n-b%3b-s%3s{vendor}"
+EOF
+	},
+	{
+		desc     => "old style SYSFS_ attribute",
 		subsys   => "block",
 		devpath  => "block/sda",
-		expected => "disk-IBM-ESXS-sda" ,
+		expected => "good" ,
 		conf     => <<EOF
-BUS="scsi", SYSFS{vendor}="IBM-ESXS", NAME="disk-%s{vendor}-%k"
-KERNEL="ttyUSB0", NAME="visor"
+BUS="scsi", SYSFS_vendor="IBM-ESXS", NAME="good"
 EOF
 	},
 	{
@@ -242,6 +250,15 @@ EOF
 		expected => "escape-3" ,
 		conf     => <<EOF
 BUS="scsi", PROGRAM="/bin/echo -n escape-%%n", KERNEL="sda3", NAME="%c"
+EOF
+	},
+	{
+		desc     => "program with lots of arguments",
+		subsys   => "block",
+		devpath  => "block/sda/sda3",
+		expected => "foo9" ,
+		conf     => <<EOF
+BUS="scsi", PROGRAM="/bin/echo -n foo3 foo4 foo5 foo6 foo7 foo8 foo9", KERNEL="sda3", NAME="%c{7}"
 EOF
 	},
 	{
@@ -250,7 +267,7 @@ EOF
 		devpath  => "block/sda/sda3",
 		expected => "link1" ,
 		conf     => <<EOF
-BUS="scsi", PROGRAM="/bin/echo -n node link1 link2", RESULT="node *", NAME="%1c", SYMLINK="%2c %3c"
+BUS="scsi", PROGRAM="/bin/echo -n node link1 link2", RESULT="node *", NAME="%c{1}", SYMLINK="%c{2} %c{3}"
 EOF
 	},
 	{