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

diff --git a/test/udev-test.pl b/test/udev-test.pl
index dadec568b..52c5c8d48 100644
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -14,9 +14,8 @@
 # After creation and removal the result is checked against the
 # expected value and the result is printed.
 #
-# happy testing,
 # Kay Sievers <kay.sievers@vrfy.org>, 2003
-
+# Leann Ogasawara <ogasawara@osdl.org>, 2004
 
 use warnings;
 use strict;
@@ -25,38 +24,40 @@ my $PWD = $ENV{PWD};
 my $sysfs     = "sys/";
 my $udev_bin  = "../udev";
 my $udev_root = "udev-root/"; # !!! directory will be removed !!!
-my $udev_db   = ".udev.tdb";
-my $perm      = "udev.permissions";
+my $udev_db   = ".udevdb";
 my $main_conf = "udev-test.conf";
 my $conf_tmp  = "udev-test.rules";
 
+# uncomment following line to run udev with valgrind.
+# Should make this a runtime option to the script someday...
+#my $udev_bin  = "valgrind --tool=memcheck --leak-check=yes   ../udev";
 
 my @tests = (
 	{
-		desc     => "label test of scsi disc",
-		subsys   => "block",
-		devpath  => "block/sda",
-		expected => "boot_disk" ,
-		conf     => <<EOF
+		desc		=> "label test of scsi disc",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "boot_disk" ,
+		conf		=> <<EOF
 BUS="scsi", SYSFS{vendor}="IBM-ESXS", NAME="boot_disk%n"
 KERNEL="ttyUSB0", NAME="visor"
 EOF
 	},
 	{
-		desc     => "label test of scsi partition",
-		subsys   => "block",
-		devpath  => "block/sda/sda1",
-		expected => "boot_disk1" ,
-		conf     => <<EOF
+		desc		=> "label test of scsi partition",
+		subsys		=> "block",
+		devpath		=> "/block/sda/sda1",
+		exp_name	=> "boot_disk1" ,
+		conf		=> <<EOF
 BUS="scsi", SYSFS{vendor}="IBM-ESXS", NAME="boot_disk%n"
 EOF
 	},
 	{
-		desc     => "label test of pattern match",
-		subsys   => "block",
-		devpath  => "block/sda/sda1",
-		expected => "boot_disk1" ,
-		conf     => <<EOF
+		desc		=> "label test of pattern match",
+		subsys		=> "block",
+		devpath		=> "/block/sda/sda1",
+		exp_name	=> "boot_disk1" ,
+		conf		=> <<EOF
 BUS="scsi", SYSFS{vendor}="?IBM-ESXS", NAME="boot_disk%n-1"
 BUS="scsi", SYSFS{vendor}="IBM-ESXS?", NAME="boot_disk%n-2"
 BUS="scsi", SYSFS{vendor}="IBM-ES??", NAME="boot_disk%n"
@@ -64,169 +65,224 @@ BUS="scsi", SYSFS{vendor}="IBM-ESXSS", NAME="boot_disk%n-3"
 EOF
 	},
 	{
-		desc     => "label test of multiple sysfs files",
-		subsys   => "block",
-		devpath  => "block/sda/sda1",
-		expected => "boot_disk1" ,
-		conf     => <<EOF
+		desc		=> "label test of multiple sysfs files",
+		subsys		=> "block",
+		devpath		=> "/block/sda/sda1",
+		exp_name	=> "boot_disk1" ,
+		conf		=> <<EOF
 BUS="scsi", SYSFS{vendor}="IBM-ESXS", SYSFS{model}="ST336605LW   !#", NAME="boot_diskX%n"
 BUS="scsi", SYSFS{vendor}="IBM-ESXS", SYSFS{model}="ST336605LW    !#", NAME="boot_disk%n"
 EOF
 	},
 	{
-		desc     => "label test of max sysfs files",
-		subsys   => "block",
-		devpath  => "block/sda/sda1",
-		expected => "boot_disk1" ,
-		conf     => <<EOF
+		desc		=> "label test of max sysfs files",
+		subsys		=> "block",
+		devpath		=> "/block/sda/sda1",
+		exp_name	=> "boot_disk1" ,
+		conf		=> <<EOF
 BUS="scsi", SYSFS{vendor}="IBM-ESXS", SYSFS{model}="ST336605LW    !#", SYSFS{scsi_level}="4", SYSFS{rev}="B245", SYSFS{type}="2", SYSFS{queue_depth}="32", NAME="boot_diskXX%n"
 BUS="scsi", SYSFS{vendor}="IBM-ESXS", SYSFS{model}="ST336605LW    !#", SYSFS{scsi_level}="4", SYSFS{rev}="B245", SYSFS{type}="0", NAME="boot_disk%n"
 EOF
 	},
 	{
-		desc     => "catch device by *",
-		subsys   => "tty",
-		devpath  => "class/tty/ttyUSB0",
-		expected => "visor/0" ,
-		conf     => <<EOF
+		desc		=> "catch device by *",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/ttyUSB0",
+		exp_name	=> "visor/0" ,
+		conf		=> <<EOF
 KERNEL="ttyUSB*", NAME="visor/%n"
 EOF
 	},
 	{
-		desc     => "catch device by * - take 2",
-		subsys   => "tty",
-		devpath  => "class/tty/ttyUSB0",
-		expected => "visor/0" ,
-		conf     => <<EOF
+		desc		=> "catch device by * - take 2",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/ttyUSB0",
+		exp_name	=> "visor/0" ,
+		conf		=> <<EOF
 KERNEL="*USB1", NAME="bad"
 KERNEL="*USB0", NAME="visor/%n"
 EOF
 	},
 	{
-		desc     => "catch device by ?",
-		subsys   => "tty",
-		devpath  => "class/tty/ttyUSB0",
-		expected => "visor/0" ,
-		conf     => <<EOF
+		desc		=> "catch device by ?",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/ttyUSB0",
+		exp_name	=> "visor/0" ,
+		conf		=> <<EOF
 KERNEL="ttyUSB??*", NAME="visor/%n-1"
 KERNEL="ttyUSB??", NAME="visor/%n-2"
 KERNEL="ttyUSB?", NAME="visor/%n"
 EOF
 	},
 	{
-		desc     => "catch device by character class",
-		subsys   => "tty",
-		devpath  => "class/tty/ttyUSB0",
-		expected => "visor/0" ,
-		conf     => <<EOF
+		desc		=> "catch device by character class",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/ttyUSB0",
+		exp_name	=> "visor/0" ,
+		conf		=> <<EOF
 KERNEL="ttyUSB[A-Z]*", NAME="visor/%n-1"
 KERNEL="ttyUSB?[0-9]", NAME="visor/%n-2"
 KERNEL="ttyUSB[0-9]*", NAME="visor/%n"
 EOF
 	},
 	{
-		desc     => "replace kernel name",
-		subsys   => "tty",
-		devpath  => "class/tty/ttyUSB0",
-		expected => "visor" ,
-		conf     => <<EOF
+		desc		=> "replace kernel name",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/ttyUSB0",
+		exp_name	=> "visor" ,
+		conf		=> <<EOF
 KERNEL="ttyUSB0", NAME="visor"
 EOF
 	},
 	{
-		desc     => "Handle comment lines in config file (and replace kernel name)",
-		subsys   => "tty",
-		devpath  => "class/tty/ttyUSB0",
-		expected => "visor" ,
-		conf     => <<EOF
+		desc		=> "Handle comment lines in config file (and replace kernel name)",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/ttyUSB0",
+		exp_name	=> "visor" ,
+		conf		=> <<EOF
 # this is a comment
 KERNEL="ttyUSB0", NAME="visor"
 
 EOF
 	},
 	{
-		desc     => "Handle comment lines in config file with whitespace (and replace kernel name)",
-		subsys   => "tty",
-		devpath  => "class/tty/ttyUSB0",
-		expected => "visor" ,
-		conf     => <<EOF
+		desc		=> "Handle comment lines in config file with whitespace (and replace kernel name)",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/ttyUSB0",
+		exp_name	=> "visor" ,
+		conf		=> <<EOF
  # this is a comment with whitespace before the comment 
 KERNEL="ttyUSB0", NAME="visor"
 
 EOF
 	},
 	{
-		desc     => "Handle empty lines in config file (and replace kernel name)",
-		subsys   => "tty",
-		devpath  => "class/tty/ttyUSB0",
-		expected => "visor" ,
-		conf     => <<EOF
+		desc		=> "Handle whitespace only lines (and replace kernel name)",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/ttyUSB0",
+		exp_name	=> "whitespace" ,
+		conf		=> <<EOF
+
+ 
+
+ # this is a comment with whitespace before the comment 
+KERNEL="ttyUSB0", NAME="whitespace"
+
+ 
+
+EOF
+	},
+	{
+		desc		=> "Handle empty lines in config file (and replace kernel name)",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/ttyUSB0",
+		exp_name	=> "visor" ,
+		conf		=> <<EOF
 
 KERNEL="ttyUSB0", NAME="visor"
 
 EOF
 	},
 	{
-		desc     => "subdirectory handling",
-		subsys   => "tty",
-		devpath  => "class/tty/ttyUSB0",
-		expected => "sub/direct/ory/visor" ,
-		conf     => <<EOF
+		desc		=> "Handle backslashed multi lines in config file (and replace kernel name)",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/ttyUSB0",
+		exp_name	=> "visor" ,
+		conf		=> <<EOF
+KERNEL="ttyUSB0", \\
+NAME="visor"
+
+EOF
+	},
+	{
+		desc		=> "preserve backslashes, if they are not for a newline",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/ttyUSB0",
+		exp_name	=> "aaa",
+		conf		=> <<EOF
+KERNEL="ttyUSB0", PROGRAM="/bin/echo -e \\101", RESULT="A", NAME="aaa"
+EOF
+	},
+	{
+		desc		=> "Handle stupid backslashed multi lines in config file (and replace kernel name)",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/ttyUSB0",
+		exp_name	=> "visor" ,
+		conf		=> <<EOF
+
+#
+\\
+
+\\\\
+
+#\\
+
+KERNEL="ttyUSB0", \\
+	NAME="visor"
+
+EOF
+	},
+	{
+		desc		=> "subdirectory handling",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/ttyUSB0",
+		exp_name	=> "sub/direct/ory/visor" ,
+		conf		=> <<EOF
 KERNEL="ttyUSB0", NAME="sub/direct/ory/visor"
 EOF
 	},
 	{
-		desc     => "place on bus of scsi partition",
-		subsys   => "block",
-		devpath  => "block/sda/sda3",
-		expected => "first_disk3" ,
-		conf     => <<EOF
-BUS="scsi", PLACE="0:0:0:0", NAME="first_disk%n"
+		desc		=> "place on bus of scsi partition",
+		subsys		=> "block",
+		devpath		=> "/block/sda/sda3",
+		exp_name	=> "first_disk3" ,
+		conf		=> <<EOF
+BUS="scsi", ID="0:0:0:0", NAME="first_disk%n"
 EOF
 	},
 	{
-		desc     => "test NAME substitution chars",
-		subsys   => "block",
-		devpath  => "block/sda/sda3",
-		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"
+		desc		=> "test NAME substitution chars",
+		subsys		=> "block",
+		devpath		=> "/block/sda/sda3",
+		exp_name	=> "Major:8:minor:3:kernelnumber:3:bus:0:0:0:0" ,
+		conf		=> <<EOF
+BUS="scsi", ID="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}"
+		desc		=> "test NAME substitution chars (with length limit)",
+		subsys		=> "block",
+		devpath		=> "/block/sda/sda3",
+		exp_name	=> "M8-m3-n3-b0:0-sIBM" ,
+		conf		=> <<EOF
+BUS="scsi", ID="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
+		desc		=> "old style SYSFS_ attribute",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "good" ,
+		conf		=> <<EOF
 BUS="scsi", SYSFS_vendor="IBM-ESXS", NAME="good"
 EOF
 	},
 	{
-		desc     => "sustitution of sysfs value (%s{file})",
-		subsys   => "block",
-		devpath  => "block/sda",
-		expected => "disk-IBM-ESXS-sda" ,
-		conf     => <<EOF
+		desc		=> "sustitution of sysfs value (%s{file})",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "disk-IBM-ESXS-sda" ,
+		conf		=> <<EOF
 BUS="scsi", SYSFS{vendor}="IBM-ESXS", NAME="disk-%s{vendor}-%k"
 KERNEL="ttyUSB0", NAME="visor"
 EOF
 	},
 	{
-		desc     => "program result substitution",
-		subsys   => "block",
-		devpath  => "block/sda/sda3",
-		expected => "special-device-3" ,
-		conf     => <<EOF
+		desc		=> "program result substitution",
+		subsys		=> "block",
+		devpath		=> "/block/sda/sda3",
+		exp_name	=> "special-device-3" ,
+		conf		=> <<EOF
 BUS="scsi", PROGRAM="/bin/echo -n special-device", RESULT="-special-*", NAME="%c-1-%n"
 BUS="scsi", PROGRAM="/bin/echo -n special-device", RESULT="special--*", NAME="%c-2-%n"
 BUS="scsi", PROGRAM="/bin/echo -n special-device", RESULT="special-device-", NAME="%c-3-%n"
@@ -235,216 +291,190 @@ BUS="scsi", PROGRAM="/bin/echo -n special-device", RESULT="special-*", NAME="%c-
 EOF
 	},
 	{
-		desc     => "program result substitution",
-		subsys   => "block",
-		devpath  => "block/sda/sda3",
-		expected => "test-0:0:0:0" ,
-		conf     => <<EOF
+		desc		=> "program result substitution (no argument should be subsystem)",
+		subsys		=> "block",
+		devpath		=> "/block/sda/sda3",
+		exp_name	=> "subsys_block" ,
+		conf		=> <<EOF
+BUS="scsi", PROGRAM="/bin/echo", RESULT="block", NAME="subsys_block"
+EOF
+	},
+	{
+		desc		=> "program result substitution (newline removal)",
+		subsys		=> "block",
+		devpath		=> "/block/sda/sda3",
+		exp_name	=> "newline_removed" ,
+		conf		=> <<EOF
+BUS="scsi", PROGRAM="/bin/echo test", RESULT="test", NAME="newline_removed"
+EOF
+	},
+	{
+		desc		=> "program result substitution",
+		subsys		=> "block",
+		devpath		=> "/block/sda/sda3",
+		exp_name	=> "test-0:0:0:0" ,
+		conf		=> <<EOF
 BUS="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  => "block/sda/sda3",
-		expected => "escape-3" ,
-		conf     => <<EOF
+		desc		=> "program with escaped format char (tricky: callout returns format char!)",
+		subsys		=> "block",
+		devpath		=> "/block/sda/sda3",
+		exp_name	=> "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
+		desc		=> "program with lots of arguments",
+		subsys		=> "block",
+		devpath		=> "/block/sda/sda3",
+		exp_name	=> "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
+		desc		=> "program with subshell",
+		subsys		=> "block",
+		devpath		=> "/block/sda/sda3",
+		exp_name	=> "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
+		desc		=> "program arguments combined with apostrophes",
+		subsys		=> "block",
+		devpath		=> "/block/sda/sda3",
+		exp_name	=> "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
+		desc		=> "characters before the %c{N} substitution",
+		subsys		=> "block",
+		devpath		=> "/block/sda/sda3",
+		exp_name	=> "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
+		desc		=> "substitute the second to last argument",
+		subsys		=> "block",
+		devpath		=> "/block/sda/sda3",
+		exp_name	=> "my-foo8" ,
+		conf		=> <<EOF
 BUS="scsi", PROGRAM="/bin/echo -n foo3 foo4 foo5 foo6 foo7 foo8 foo9", KERNEL="sda3", NAME="my-%c{6}"
 EOF
 	},
 	{
-		desc     => "program result substitution (numbered part of)",
-		subsys   => "block",
-		devpath  => "block/sda/sda3",
-		expected => "link1" ,
-		conf     => <<EOF
-BUS="scsi", PROGRAM="/bin/echo -n node link1 link2", RESULT="node *", NAME="%c{1}", SYMLINK="%c{2} %c{3}"
-EOF
-	},
-	{
-		desc     => "invalid program for device with no bus",
-		subsys   => "tty",
-		devpath  => "class/tty/console",
-		expected => "TTY" ,
-		conf     => <<EOF
+		desc		=> "invalid program for device with no bus",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/console",
+		exp_name	=> "TTY" ,
+		conf		=> <<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",
-		expected => "foo" ,
-		conf     => <<EOF
+		desc		=> "valid program for device with no bus",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/console",
+		exp_name	=> "foo" ,
+		conf		=> <<EOF
 PROGRAM="/bin/echo -n foo", RESULT="foo", NAME="foo"
 KERNEL="console", NAME="TTY"
 EOF
 	},
 	{
-		desc     => "invalid label for device with no bus",
-		subsys   => "tty",
-		devpath  => "class/tty/console",
-		expected => "TTY" ,
-		conf     => <<EOF
+		desc		=> "invalid label for device with no bus",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/console",
+		exp_name	=> "TTY" ,
+		conf		=> <<EOF
 BUS="foo", SYSFS{dev}="5:1", NAME="foo"
 KERNEL="console", NAME="TTY"
 EOF
 	},
 	{
-		desc     => "valid label for device with no bus",
-		subsys   => "tty",
-		devpath  => "class/tty/console",
-		expected => "foo" ,
-		conf     => <<EOF
+		desc		=> "valid label for device with no bus",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/console",
+		exp_name	=> "foo" ,
+		conf		=> <<EOF
 SYSFS{dev}="5:1", NAME="foo"
 KERNEL="console", NAME="TTY"
 EOF
 	},
 	{
-		desc     => "program and bus type match",
-		subsys   => "block",
-		devpath  => "block/sda",
-		expected => "scsi-0:0:0:0" ,
-		conf     => <<EOF
+		desc		=> "program and bus type match",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "scsi-0:0:0:0" ,
+		conf		=> <<EOF
 BUS="usb", PROGRAM="/bin/echo -n usb-%b", NAME="%c"
 BUS="scsi", PROGRAM="/bin/echo -n scsi-%b", NAME="%c"
 BUS="foo", PROGRAM="/bin/echo -n foo-%b", NAME="%c"
 EOF
 	},
 	{
-		desc     => "symlink creation (same directory)",
-		subsys   => "tty",
-		devpath  => "class/tty/ttyUSB0",
-		expected => "visor0" ,
-		conf     => <<EOF
-KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="visor%n"
-EOF
-	},
-	{
-		desc     => "symlink creation (relative link back)",
-		subsys   => "block",
-		devpath  => "block/sda/sda2",
-		expected => "1/2/a/b/symlink" ,
-		conf     => <<EOF
-BUS="scsi", SYSFS{vendor}="IBM-ESXS", NAME="1/2/node", SYMLINK="1/2/a/b/symlink"
-EOF
-	},
-	{
-		desc     => "symlink creation (relative link forward)",
-		subsys   => "block",
-		devpath  => "block/sda/sda2",
-		expected => "1/2/symlink" ,
-		conf     => <<EOF
-BUS="scsi", SYSFS{vendor}="IBM-ESXS", NAME="1/2/a/b/node", SYMLINK="1/2/symlink"
-EOF
-	},
-	{
-		desc     => "symlink creation (relative link back and forward)",
-		subsys   => "block",
-		devpath  => "block/sda/sda2",
-		expected => "1/2/c/d/symlink" ,
-		conf     => <<EOF
-BUS="scsi", SYSFS{vendor}="IBM-ESXS", NAME="1/2/a/b/node", SYMLINK="1/2/c/d/symlink"
-EOF
-	},
-	{
-		desc     => "multiple symlinks",
-		subsys   => "tty",
-		devpath  => "class/tty/ttyUSB0",
-		expected => "second-0" ,
-		conf     => <<EOF
-KERNEL="ttyUSB0", NAME="visor", SYMLINK="first-%n second-%n third-%n"
-EOF
-	},
-	{
-		desc     => "create all possible partitions",
-		subsys   => "block",
-		devpath  => "block/sda",
-		expected => "boot_disk15" ,
-		conf     => <<EOF
+		desc		=> "create all possible partitions",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "boot_disk15" ,
+		conf		=> <<EOF
 BUS="scsi", SYSFS{vendor}="IBM-ESXS", NAME{all_partitions}="boot_disk"
 EOF
 	},
 	{
-		desc     => "sysfs parent hierarchy",
-		subsys   => "tty",
-		devpath  => "class/tty/ttyUSB0",
-		expected => "visor" ,
-		conf     => <<EOF
+		desc		=> "sysfs parent hierarchy",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/ttyUSB0",
+		exp_name	=> "visor" ,
+		conf		=> <<EOF
 SYSFS{idProduct}="2008", NAME="visor"
 EOF
 	},
 	{
-		desc     => "name test with ! in the name",
-		subsys   => "block",
-		devpath  => "block/rd!c0d0",
-		expected => "rd/c0d0" ,
-		conf     => <<EOF
+		desc		=> "name test with ! in the name",
+		subsys		=> "block",
+		devpath		=> "/block/rd!c0d0",
+		exp_name	=> "rd/c0d0" ,
+		conf		=> <<EOF
 BUS="scsi", NAME="%k"
 KERNEL="ttyUSB0", NAME="visor"
 EOF
 	},
 	{
-		desc     => "name test with ! in the name, but no matching rule",
-		subsys   => "block",
-		devpath  => "block/rd!c0d0",
-		expected => "rd/c0d0" ,
-		conf     => <<EOF
+		desc		=> "name test with ! in the name, but no matching rule",
+		subsys		=> "block",
+		devpath		=> "/block/rd!c0d0",
+		exp_name	=> "rd/c0d0" ,
+		conf		=> <<EOF
 KERNEL="ttyUSB0", NAME="visor"
 EOF
 	},
 	{
-		desc     => "ID rule",
-		subsys   => "block",
-		devpath  => "block/sda",
-		expected => "scsi-0:0:0:0",
-		conf     => <<EOF
+		desc		=> "name test with ! in the name for a partition",
+		subsys		=> "block",
+		devpath		=> "/block/cciss!c0d0/cciss!c0d0p1",
+		exp_name	=> "cciss/c0d0p1" ,
+		conf		=> <<EOF
+BUS="scsi", NAME="%k"
+KERNEL="ttyUSB0", NAME="visor"
+EOF
+	},
+	{
+		desc		=> "ID rule",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "scsi-0:0:0:0",
+		conf		=> <<EOF
 BUS="usb", ID="0:0:0:0", NAME="not-scsi"
 BUS="scsi", ID="0:0:0:1", NAME="no-match"
 BUS="scsi", ID=":0", NAME="short-id"
@@ -453,11 +483,11 @@ BUS="scsi", ID="0:0:0:0", NAME="scsi-0:0:0:0"
 EOF
 	},
 	{
-		desc     => "ID wildcard all",
-		subsys   => "block",
-		devpath  => "block/sda",
-		expected => "scsi-0:0:0:0",
-		conf     => <<EOF
+		desc		=> "ID wildcard all",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "scsi-0:0:0:0",
+		conf		=> <<EOF
 BUS="scsi", ID="*:1", NAME="no-match"
 BUS="scsi", ID="*:0:1", NAME="no-match"
 BUS="scsi", ID="*:0:0:1", NAME="no-match"
@@ -466,42 +496,637 @@ BUS="scsi", ID="0:0:0:0", NAME="bad"
 EOF
 	},
 	{
-		desc     => "ID wildcard partial",
-		subsys   => "block",
-		devpath  => "block/sda",
-		expected => "scsi-0:0:0:0",
-		conf     => <<EOF
+		desc		=> "ID wildcard partial",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "scsi-0:0:0:0",
+		conf		=> <<EOF
 BUS="scsi", ID="*:0", NAME="scsi-0:0:0:0"
 BUS="scsi", ID="0:0:0:0", NAME="bad"
 EOF
 	},
 	{
-		desc     => "ID wildcard partial 2",
-		subsys   => "block",
-		devpath  => "block/sda",
-		expected => "scsi-0:0:0:0",
-		conf     => <<EOF
+		desc		=> "ID wildcard partial 2",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "scsi-0:0:0:0",
+		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
+		desc		=> "ignore SYSFS attribute whitespace",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "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
+		desc		=> "do not ignore SYSFS attribute whitespace",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "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
+	},
+	{
+		desc		=> "permissions USER=bad GROUP=name",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/tty33",
+		exp_name	=> "tty33",
+		exp_perms	=> "0:0:0660",
+		conf		=> <<EOF
+KERNEL="tty33", NAME="tty33", OWNER="bad", GROUP="name"
+EOF
+	},
+	{
+		desc		=> "permissions OWNER=5000",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "node",
+		exp_perms	=> "5000::0660",
+		conf		=> <<EOF
+BUS="scsi", KERNEL="sda", NAME="node", OWNER="5000"
+EOF
+	},
+	{
+		desc		=> "permissions GROUP=100",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "node",
+		exp_perms	=> ":100:0660",
+		conf		=> <<EOF
+BUS="scsi", KERNEL="sda", NAME="node", GROUP="100"
+EOF
+	},
+	{
+		desc		=> "permissions MODE=0777",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "node",
+		exp_perms	=> "::0777",
+		conf		=> <<EOF
+BUS="scsi", KERNEL="sda", NAME="node", MODE="0777"
+EOF
+	},
+	{
+		desc		=> "permissions OWNER=5000 GROUP=100 MODE=0777",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "node",
+		exp_perms	=> "5000:100:0777",
+		conf		=> <<EOF
+BUS="scsi", KERNEL="sda", NAME="node", OWNER="5000", GROUP="100", MODE="0777"
+EOF
+	},
+	{
+		desc		=> "permissions OWNER to 5000",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/ttyUSB0",
+		exp_name	=> "ttyUSB0",
+		exp_perms	=> "5000::",
+		conf		=> <<EOF
+KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", OWNER="5000"
+EOF
+	},
+	{
+		desc		=> "permissions GROUP to 100",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/ttyUSB0",
+		exp_name	=> "ttyUSB0",
+		exp_perms	=> ":100:0660",
+		conf		=> <<EOF
+KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", GROUP="100"
+EOF
+	},
+	{
+		desc		=> "permissions MODE to 0060",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/ttyUSB0",
+		exp_name	=> "ttyUSB0",
+		exp_perms	=> "::0060",
+		conf		=> <<EOF
+KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", MODE="0060"
+EOF
+	},
+	{
+		desc		=> "permissions OWNER, GROUP, MODE",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/ttyUSB0",
+		exp_name	=> "ttyUSB0",
+		exp_perms	=> "5000:100:0777",
+		conf		=> <<EOF
+KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", OWNER="5000", GROUP="100", MODE="0777"
+EOF
+	},
+	{
+		desc		=> "permissions only rule",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/ttyUSB0",
+		exp_name	=> "ttyUSB0",
+		exp_perms	=> "5000:100:0777",
+		conf		=> <<EOF
+KERNEL="ttyUSB[0-9]*", OWNER="5000", GROUP="100", MODE="0777"
+KERNEL="ttyUSX[0-9]*", OWNER="5001", GROUP="101", MODE="0444"
+KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n"
+EOF
+	},
+	{
+		desc		=> "multiple permissions only rule",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/ttyUSB0",
+		exp_name	=> "ttyUSB0",
+		exp_perms	=> "3000:4000:0777",
+		conf		=> <<EOF
+SUBSYSTEM="tty", OWNER="3000"
+SUBSYSTEM="tty", GROUP="4000"
+SUBSYSTEM="tty", MODE="0777"
+KERNEL="ttyUSX[0-9]*", OWNER="5001", GROUP="101", MODE="0444"
+KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n"
+EOF
+	},
+	{
+		desc		=> "permissions only rule with override at NAME rule",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/ttyUSB0",
+		exp_name	=> "ttyUSB0",
+		exp_perms	=> "3000:8000:0777",
+		conf		=> <<EOF
+SUBSYSTEM="tty", OWNER="3000"
+SUBSYSTEM="tty", GROUP="4000"
+SUBSYSTEM="tty", MODE="0777"
+KERNEL="ttyUSX[0-9]*", OWNER="5001", GROUP="101", MODE="0444"
+KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", GROUP="8000"
+EOF
+	},
+	{
+		desc		=> "major/minor number test",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "node",
+		exp_majorminor	=> "8:0",
+		conf		=> <<EOF
+BUS="scsi", KERNEL="sda", NAME="node"
+EOF
+	},
+	{
+		desc		=> "big minor number test",
+		subsys		=> "i2c-dev",
+		devpath		=> "/class/i2c-dev/i2c-300",
+		exp_name	=> "node",
+		exp_majorminor	=> "89:300",
+		conf		=> <<EOF
+KERNEL="i2c-300", NAME="node"
+EOF
+	},
+	{
+		desc		=> "big major number test",
+		subsys		=> "i2c-dev",
+		devpath		=> "/class/i2c-dev/i2c-fake1",
+		exp_name	=> "node",
+		exp_majorminor	=> "4095:1",
+		conf		=> <<EOF
+KERNEL="i2c-fake1", NAME="node"
+EOF
+	},
+	{
+		desc		=> "big major and big minor number test",
+		subsys		=> "i2c-dev",
+		devpath		=> "/class/i2c-dev/i2c-fake2",
+		exp_name	=> "node",
+		exp_majorminor	=> "4094:89999",
+		conf		=> <<EOF
+KERNEL="i2c-fake2", NAME="node"
+EOF
+	},
+	{
+		desc		=> "multiple symlinks with format char",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/ttyUSB0",
+		exp_name	=> "symlink2-ttyUSB0",
+		exp_target	=> "ttyUSB0",
+		conf		=> <<EOF
+KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="symlink1-%n symlink2-%k symlink3-%b"
+EOF
+	},
+	{
+		desc		=> "symlink creation (same directory)",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/ttyUSB0",
+		exp_name	=> "visor0",
+		exp_target	=> "ttyUSB0",
+		conf		=> <<EOF
+KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="visor%n"
+EOF
+	},
+	{
+		desc		=> "symlink creation (relative link forward)",
+		subsys		=> "block",
+		devpath		=> "/block/sda/sda2",
+		exp_name	=> "1/2/symlink" ,
+		exp_target	=> "a/b/node",
+		conf		=> <<EOF
+BUS="scsi", SYSFS{vendor}="IBM-ESXS", NAME="1/2/a/b/node", SYMLINK="1/2/symlink"
+EOF
+	},
+	{
+		desc		=> "symlink creation (relative link back and forward)",
+		subsys		=> "block",
+		devpath		=> "/block/sda/sda2",
+		exp_name	=> "1/2/c/d/symlink" ,
+		exp_target	=> "../../a/b/node",
+		conf		=> <<EOF
+BUS="scsi", SYSFS{vendor}="IBM-ESXS", NAME="1/2/a/b/node", SYMLINK="1/2/c/d/symlink"
+EOF
+	},
+	{
+		desc		=> "multiple symlinks",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/ttyUSB0",
+		exp_name	=> "second-0" ,
+		exp_target	=> "visor" ,
+		conf		=> <<EOF
+KERNEL="ttyUSB0", NAME="visor", SYMLINK="first-%n second-%n third-%n"
+EOF
+	},
+	{
+		desc		=> "symlink only rule",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "symlink-only2",
+		exp_target	=> "link",
+		conf		=> <<EOF
+BUS="scsi", KERNEL="sda", SYMLINK="symlink-only1"
+BUS="scsi", KERNEL="sda", SYMLINK="symlink-only2"
+BUS="scsi", KERNEL="sda", NAME="link", SYMLINK="symlink0"
+EOF
+	},
+	{
+		desc		=> "symlink name '.'",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> ".",
+		exp_target	=> "link",
+		exp_add_error	=> "yes",
+		exp_rem_error	=> "yes",
+		conf		=> <<EOF
+BUS="scsi", KERNEL="sda", NAME="link", SYMLINK="."
+EOF
+	},
+	{
+		desc		=> "symlink node to itself",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/tty0",
+		exp_name	=> "link",
+		exp_target	=> "link",
+		exp_rem_error	=> "yes",
+		option		=> "clear",
+		conf		=> <<EOF
+KERNEL="tty0", NAME="link", SYMLINK="link"
+EOF
+	},
+	{
+		desc		=> "symlink %n substitution",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/ttyUSB0",
+		exp_name	=> "symlink0",
+		exp_target	=> "ttyUSB0",
+		conf		=> <<EOF
+KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="symlink%n"
+EOF
+	},
+	{
+		desc		=> "symlink %k substitution",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/ttyUSB0",
+		exp_name	=> "symlink-ttyUSB0",
+		exp_target	=> "ttyUSB0",
+		conf		=> <<EOF
+KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="symlink-%k"
+EOF
+	},
+	{
+		desc		=> "symlink %M:%m substitution",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/ttyUSB0",
+		exp_name	=> "major-188:0",
+		exp_target	=> "ttyUSB0",
+		conf		=> <<EOF
+KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="major-%M:%m"
+EOF
+	},
+	{
+		desc		=> "symlink %b substitution",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "symlink-0:0:0:0",
+		exp_target	=> "node",
+		conf		=> <<EOF
+BUS="scsi", KERNEL="sda", NAME="node", SYMLINK="symlink-%b"
+EOF
+	},
+	{
+		desc		=> "symlink %c substitution",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/ttyUSB0",
+		exp_name	=> "test",
+		exp_target	=> "ttyUSB0",
+		conf		=> <<EOF
+KERNEL="ttyUSB[0-9]*", PROGRAM="/bin/echo test" NAME="ttyUSB%n", SYMLINK="%c"
+EOF
+	},
+	{
+		desc		=> "symlink %c{N} substitution",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/ttyUSB0",
+		exp_name	=> "test",
+		exp_target	=> "ttyUSB0",
+		conf		=> <<EOF
+KERNEL="ttyUSB[0-9]*", PROGRAM="/bin/echo symlink test this" NAME="ttyUSB%n", SYMLINK="%c{2}"
+EOF
+	},
+	{
+		desc		=> "symlink %c{N+} substitution",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/ttyUSB0",
+		exp_name	=> "this",
+		exp_target	=> "ttyUSB0",
+		conf		=> <<EOF
+KERNEL="ttyUSB[0-9]*", PROGRAM="/bin/echo symlink test this" NAME="ttyUSB%n", SYMLINK="%c{2+}"
+EOF
+	},
+	{
+		desc		=> "symlink only rule with %c{N+}",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "test",
+		exp_target	=> "link",
+		conf		=> <<EOF
+BUS="scsi", KERNEL="sda", PROGRAM="/bin/echo link test this" SYMLINK="%c{2+}"
+BUS="scsi", KERNEL="sda", NAME="link", SYMLINK="symlink0"
+EOF
+	},
+	{
+		desc		=> "symlink %s{filename} substitution",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/ttyUSB0",
+		exp_name	=> "188:0",
+		exp_target	=> "ttyUSB0",
+		conf		=> <<EOF
+KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="%s{dev}"
+EOF
+	},
+	{
+		desc		=> "symlink %Ns{filename} substitution",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/ttyUSB0",
+		exp_name	=> "188",
+		exp_target	=> "ttyUSB0",
+		conf		=> <<EOF
+KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="%3s{dev}"
+EOF
+	},
+	{
+		desc		=> "symlink with '%' in name",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/ttyUSB0",
+		exp_name	=> "percent%sign",
+		exp_target	=> "ttyUSB0",
+		conf		=> <<EOF
+KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="percent%%sign"
+EOF
+	},
+	{
+		desc		=> "symlink with '%' in name",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/ttyUSB0",
+		exp_name	=> "%ttyUSB0_name",
+		exp_target	=> "ttyUSB0",
+		conf		=> <<EOF
+KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="%%%k_name"
+EOF
+	},
+	{
+		desc		=> "program result substitution (numbered part of)",
+		subsys		=> "block",
+		devpath		=> "/block/sda/sda3",
+		exp_name	=> "link1",
+		exp_target	=> "node",
+		conf		=> <<EOF
+BUS="scsi", PROGRAM="/bin/echo -n node link1 link2", RESULT="node *", NAME="%c{1}", SYMLINK="%c{2} %c{3}"
+EOF
+	},
+	{
+		desc		=> "program result substitution (numbered part of+)",
+		subsys		=> "block",
+		devpath		=> "/block/sda/sda3",
+		exp_name	=> "link4",
+		exp_target	=> "node",
+		conf		=> <<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",
+		conf		=> <<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",
+		conf		=> <<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",
+		conf		=> <<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",
+		conf		=> <<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",
+		conf		=> <<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		=> "clear",
+		conf		=> <<EOF
+KERNEL="sda4", NAME="cdrom%e"
+EOF
+	},
+	{
+		desc		=> "enumeration char test after cleanup (single test)",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "cdrom",
+		conf		=> <<EOF
+KERNEL="sda", NAME="cdrom%e"
+EOF
+	},
+	{
+		desc		=> "ignore rule test",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "node",
+		exp_add_error	=> "yes",
+		conf		=> <<EOF
+BUS="scsi", KERNEL="sda", NAME="node", OPTIONS="ignore"
+EOF
+	},
+	{
+		desc		=> "all_partitions, option-only rule",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "node6",
+		conf		=> <<EOF
+SUBSYSTEM="block", OPTIONS="all_partitions"
+BUS="scsi", KERNEL="sda", NAME="node"
+EOF
+	},
+	{
+		desc		=> "all_partitions, option-only rule (fail on partition)",
+		subsys		=> "block",
+		devpath		=> "/block/sda/sda1",
+		exp_name	=> "node6",
+		exp_add_error	=> "yes",
+		conf		=> <<EOF
+SUBSYSTEM="block", OPTIONS="all_partitions"
+BUS="scsi", KERNEL="sda", NAME="node"
+EOF
+	},
+	{
+		desc		=> "ignore remove event test",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "node",
+		exp_rem_error	=> "yes",
+		conf		=> <<EOF
+BUS="scsi", KERNEL="sda", NAME="node", OPTIONS="ignore_remove"
+EOF
+	},
+	{
+		desc		=> "ignore remove event test (with all partitions)",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "node14",
+		exp_rem_error	=> "yes",
+		option		=> "clear",
+		conf		=> <<EOF
+BUS="scsi", KERNEL="sda", NAME="node", OPTIONS="ignore_remove, all_partitions"
+EOF
+	},
+	{
+		desc		=> "SUBSYSTEM match test",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "node",
+		conf		=> <<EOF
+BUS="scsi", KERNEL="sda", NAME="should_not_match", SUBSYSTEM="vc"
+BUS="scsi", KERNEL="sda", NAME="node", SUBSYSTEM="block"
+BUS="scsi", KERNEL="sda", NAME="should_not_match2", SUBSYSTEM="vc"
+EOF
+	},
+	{
+		desc		=> "DRIVER match test",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "node",
+		conf		=> <<EOF
+BUS="scsi", KERNEL="sda", NAME="should_not_match", DRIVER="sd-wrong"
+BUS="scsi", KERNEL="sda", NAME="node", DRIVER="sd"
+EOF
+	},
+	{
+		desc		=> "temporary node creation test",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "node",
+		conf		=> <<EOF
+BUS="scsi", KERNEL="sda", PROGRAM="/usr/bin/test -b %N" NAME="node"
+EOF
+	},
+	{
+		desc		=> "devpath substitution test",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "sda",
+		conf		=> <<EOF
+BUS="scsi", KERNEL="sda", PROGRAM="/bin/echo %p", RESULT="/block/sda" NAME="%k"
+EOF
+	},
+	{
+		desc		=> "parent node name substitution test sequence 1/2 (keep)",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "main_device",
+		option		=> "keep",
+		conf		=> <<EOF
+BUS="scsi", KERNEL="sda", NAME="main_device"
+EOF
+	},
+	{
+		desc		=> "parent node name substitution test sequence 2/2 (clean)",
+		subsys		=> "block",
+		devpath		=> "/block/sda/sda1",
+		exp_name	=> "main_device-part-1",
+		option		=> "clean",
+		conf		=> <<EOF
+BUS="scsi", KERNEL="sda1", NAME="%P-part-1"
+EOF
+	},
+	{
+		desc		=> "udev_root substitution",
+		subsys		=> "block",
+		devpath		=> "/block/sda/sda1",
+		exp_name	=> "start-udev-root-end",
+		conf		=> <<EOF
+BUS="scsi", KERNEL="sda1", NAME="start-%r-end"
+EOF
+	},
+	{
+		desc		=> "last_rule option",
+		subsys		=> "block",
+		devpath		=> "/block/sda/sda1",
+		exp_name	=> "last",
+		conf		=> <<EOF
+BUS="scsi", KERNEL="sda1", SYMLINK="last", OPTIONS="last_rule"
+BUS="scsi", KERNEL="sda1", NAME="very-last"
 EOF
 	},
 );
@@ -510,6 +1135,8 @@ EOF
 $ENV{UDEV_TEST} = "yes";
 $ENV{SYSFS_PATH} = $sysfs;
 $ENV{UDEV_CONFIG_FILE} = $main_conf;
+$ENV{UDEV_NO_DEVD} = "yes";
+$ENV{UDEV_NO_HOTPLUGD} = "yes";
 
 
 sub udev {
@@ -528,31 +1155,156 @@ sub udev {
 
 my $error = 0;
 
+sub permissions_test {
+	my($config, $uid, $gid, $mode) = @_;
+
+	my $wrong = 0;
+	$config->{exp_perms} =~ m/^(.*):(.*):(.*)$/;
+	if ($1 ne "") {
+		if ($uid != $1) { $wrong = 1; };
+	}
+	if ($2 ne "") {
+		if ($gid != $2) { $wrong = 1; };
+	}
+	if ($3 ne "") {
+		if (($mode & 07777) != oct($3)) { $wrong = 1; };
+	}
+	if ($wrong == 0) {
+		print "permissions: ok    ";
+	} else {
+		printf "expected permissions are: %i:%i:%#o\n", $1, $2, oct($3);
+		printf "created permissions are : %i:%i:%#o\n", $uid, $gid, $mode & 07777;
+		$error++;
+	}
+}
+
+sub major_minor_test {
+	my($config, $rdev) = @_;
+
+	my $major = ($rdev >> 8) & 0xfff;
+	my $minor = ($rdev & 0xff) | (($rdev >> 12) & 0xfff00);
+	my $wrong = 0;
+
+	$config->{exp_majorminor} =~ m/^(.*):(.*)$/;
+	if ($1 ne "") {
+		if ($major != $1) { $wrong = 1; };
+	}
+	if ($2 ne "") {
+		if ($minor != $2) { $wrong = 1; };
+	}
+	if ($wrong == 0) {
+		print "major:minor: ok    ";
+	} else {
+		printf "expected major:minor is: %i:%i\n", $1, $2;
+		printf "created major:minor is : %i:%i\n", $major, $minor;
+		print "major:minor: error    ";
+		$error++;
+	}
+}
+
+sub symlink_test {
+	my ($config) = @_;
+
+	my $output = `ls -l $PWD/$udev_root$config->{exp_name}`;
+
+	if ($output =~ m/(.*)-> (.*)/) {
+		if ($2 eq $config->{exp_target}) {
+			print "symlink: ok    ";
+		} else {
+			print "expected symlink from: \'$config->{exp_name}\' to \'$config->{exp_target}\'\n";
+			print "created symlink from: \'$config->{exp_name}\' to \'$2\'\n";
+			if ($config->{exp_add_error}) {
+				print "as expected    ";
+			} else {
+				$error++;
+			}
+		}
+	} else {
+		print "expected symlink from: \'$config->{exp_name}\' to \'$config->{exp_target}\'\n";
+		print "symlink: not created ";
+		if ($config->{exp_add_error}) {
+			print "as expected    ";
+		} else {
+			$error++;
+		}
+	}
+}
+
 sub run_test {
 	my ($config, $number) = @_;
-	
+
 	print "TEST $number: $config->{desc}\n";
-	print "device \'$config->{devpath}\' expecting node \'$config->{expected}\'\n";
+
+	if ($config->{exp_target}) {
+		print "device \'$config->{devpath}\' expecting symlink '$config->{exp_name}' to node \'$config->{exp_target}\'\n";
+	} else {
+		print "device \'$config->{devpath}\' expecting node \'$config->{exp_name}\'\n";
+	}
+
 
 	udev("add", $config->{subsys}, $config->{devpath}, \$config->{conf});
-	if (-e "$PWD/$udev_root$config->{expected}") {
+	if ((-e "$PWD/$udev_root$config->{exp_name}") ||
+	    (-l "$PWD/$udev_root$config->{exp_name}")) {
+
+		my ($dev, $ino, $mode, $nlink, $uid, $gid, $rdev, $size,
+		    $atime, $mtime, $ctime, $blksize, $blocks) = stat("$PWD/$udev_root$config->{exp_name}");
+
+		if (defined($config->{exp_perms})) {
+			permissions_test($config, $uid, $gid, $mode);
+		}
+		if (defined($config->{exp_majorminor})) {
+			major_minor_test($config, $rdev);
+		}
+		if (defined($config->{exp_target})) {
+			symlink_test($config);
+		}
 		print "add: ok    ";
 	} else {
-		print "add: error\n";
-		system("tree $udev_root");
-		print "\n";
-		$error++;
+		print "add: error ";
+		if ($config->{exp_add_error}) {
+			print "as expected    ";
+		} else {
+			print "\n\n";
+			system("tree $udev_root");
+			print "\n";
+			$error++;
+		}
+	}
+
+	if (defined($config->{option}) && $config->{option} eq "keep") {
+		print "\n\n";
+		return;
 	}
 
 	udev("remove", $config->{subsys}, $config->{devpath}, \$config->{conf});
-	if ((-e "$PWD/$udev_root$config->{expected}") ||
-	    (-l "$PWD/$udev_root$config->{expected}")) {
-		print "remove: error\n\n";
-		system("tree $udev_root");
-		$error++;
+	if ((-e "$PWD/$udev_root$config->{exp_name}") ||
+	    (-l "$PWD/$udev_root$config->{exp_name}")) {
+		print "remove: error ";
+		if ($config->{exp_rem_error}) {
+			print "as expected\n\n";
+		} else {
+			print "\n\n";
+			system("tree $udev_root");
+			print "\n";
+			$error++;
+		}
 	} else {
 		print "remove: ok\n\n";
 	}
+
+	if (defined($config->{option}) && $config->{option} eq "clear") {
+		system("rm -rf $udev_db");
+		system("rm -rf $udev_root");
+		mkdir($udev_root) || die "unable to create udev_root: $udev_root\n";
+	}
+
+}
+
+# only run if we have root permissions
+# due to mknod restrictions
+if (!($<==0)) {
+	print "Must have root permissions to run properly.\n";
+	exit;
 }
 
 # prepare
@@ -564,7 +1316,6 @@ open CONF, ">$main_conf" || die "unable to create config file: $main_conf";
 print CONF "udev_root=\"$udev_root\"\n";
 print CONF "udev_db=\"$udev_db\"\n";
 print CONF "udev_rules=\"$conf_tmp\"\n";
-print CONF "udev_permissions=\"$perm\"\n";
 close CONF;
 
 my $test_num = 1;
@@ -572,9 +1323,13 @@ my $test_num = 1;
 if ($ARGV[0]) {
 	# only run one test
 	$test_num = $ARGV[0];
-	print "udev-test will run test number $test_num only\n";
 
-	run_test($tests[$test_num-1], $test_num);
+	if (defined($tests[$test_num-1]->{desc})) {
+		print "udev-test will run test number $test_num only:\n\n";
+		run_test($tests[$test_num-1], $test_num);
+	} else {
+		print "test does not exist.\n";
+	}
 } else {
 	# test all
 	print "\nudev-test will run ".($#tests + 1)." tests:\n\n";
@@ -582,14 +1337,13 @@ if ($ARGV[0]) {
 	foreach my $config (@tests) {
 		run_test($config, $test_num);
 		$test_num++;
-
 	}
 }
 
 print "$error errors occured\n\n";
 
 # cleanup
-unlink($udev_db);
+system("rm -rf $udev_db");
 system("rm -rf $udev_root");
 unlink($conf_tmp);
 unlink($main_conf);