X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=test%2Fudev-test.pl;h=dadec568ba907034e396f70963998db6a4f35f00;hb=35b38379bac87ebf4d0cc6884feff588ee859d5f;hp=6e031c4c2c3a7876478984a8d651d0afd4f31f72;hpb=88f09368b3dc2d17cf2ce1a4841e42a120a4dbb9;p=elogind.git

diff --git a/test/udev-test.pl b/test/udev-test.pl
index 6e031c4c2..dadec568b 100644
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -191,6 +191,24 @@ EOF
 		expected => "Major:8:minor:3:kernelnumber:3:bus:0:0:0:0" ,
 		conf     => <<EOF
 BUS="scsi", PLACE="0:0:0:0", NAME="Major:%M:minor:%m:kernelnumber:%n:bus:%b"
+EOF
+	},
+	{
+		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 => "good" ,
+		conf     => <<EOF
+BUS="scsi", SYSFS_vendor="IBM-ESXS", NAME="good"
 EOF
 	},
 	{
@@ -232,6 +250,51 @@ 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
+	},
+	{
+		desc     => "program with subshell",
+		subsys   => "block",
+		devpath  => "block/sda/sda3",
+		expected => "bar9" ,
+		conf     => <<EOF
+BUS="scsi", PROGRAM="/bin/sh -c 'echo foo3 foo4 foo5 foo6 foo7 foo8 foo9 | sed  s/foo9/bar9/'", KERNEL="sda3", NAME="%c{7}"
+EOF
+	},
+	{
+		desc     => "program arguments combined with apostrophes",
+		subsys   => "block",
+		devpath  => "block/sda/sda3",
+		expected => "foo7" ,
+		conf     => <<EOF
+BUS="scsi", PROGRAM="/bin/echo -n 'foo3 foo4'   'foo5   foo6   foo7 foo8'", KERNEL="sda3", NAME="%c{5}"
+EOF
+	},
+	{
+		desc     => "characters before the %c{N} substitution",
+		subsys   => "block",
+		devpath  => "block/sda/sda3",
+		expected => "my-foo9" ,
+		conf     => <<EOF
+BUS="scsi", PROGRAM="/bin/echo -n foo3 foo4 foo5 foo6 foo7 foo8 foo9", KERNEL="sda3", NAME="my-%c{7}"
+EOF
+	},
+	{
+		desc     => "substitute the second to last argument",
+		subsys   => "block",
+		devpath  => "block/sda/sda3",
+		expected => "my-foo8" ,
+		conf     => <<EOF
+BUS="scsi", PROGRAM="/bin/echo -n foo3 foo4 foo5 foo6 foo7 foo8 foo9", KERNEL="sda3", NAME="my-%c{6}"
 EOF
 	},
 	{
@@ -420,6 +483,25 @@ EOF
 		conf     => <<EOF
 BUS="scsi", ID="*:0:0:0", NAME="scsi-0:0:0:0"
 BUS="scsi", ID="0:0:0:0", NAME="bad"
+EOF
+	},
+	{
+		desc     => "ignore SYSFS attribute whitespace",
+		subsys   => "block",
+		devpath  => "block/sda",
+		expected => "ignored",
+		conf     => <<EOF
+BUS="scsi", SYSFS{whitespace_test}="WHITE  SPACE", NAME="ignored"
+EOF
+	},
+	{
+		desc     => "do not ignore SYSFS attribute whitespace",
+		subsys   => "block",
+		devpath  => "block/sda",
+		expected => "matched-with-space",
+		conf     => <<EOF
+BUS="scsi", SYSFS{whitespace_test}="WHITE  SPACE ", NAME="wrong-to-ignore"
+BUS="scsi", SYSFS{whitespace_test}="WHITE  SPACE   ", NAME="matched-with-space"
 EOF
 	},
 );