X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=test%2Fudev-test.pl;h=6cde54ffabf3d3809998fd09f2ac2d6b66ea5b48;hp=8ee8ba5414698f35ce9846584e1bdf27e1dd7268;hb=0bb438770742815c5839f3fbf1aca967fa6e4a15;hpb=8b36cc0f179ee35176016ab67ae53078df4110fa

diff --git a/test/udev-test.pl b/test/udev-test.pl
index 8ee8ba541..6cde54ffa 100644
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -14,14 +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
-#
-# Modified April 9, 2004 by Leann Ogasawara <ogasawara@osdl.org>
-#  - expanded @tests array to add more symlinks and permissions tests
-#  - some of the symlinks tests also test lack of node creation
-#  - added symlink_test() function
-#  - moved permissions and major_minor tests into their own functions
+# Leann Ogasawara <ogasawara@osdl.org>, 2004
 
 use warnings;
 use strict;
@@ -45,8 +39,8 @@ my @tests = (
 		devpath		=> "/block/sda",
 		exp_name	=> "boot_disk" ,
 		conf		=> <<EOF
-BUS="scsi", SYSFS{vendor}="IBM-ESXS", NAME="boot_disk%n"
-KERNEL="ttyUSB0", NAME="visor"
+BUS=="scsi", SYSFS{vendor}=="IBM-ESXS", NAME="boot_disk%n"
+KERNEL=="ttyUSB0", NAME="visor"
 EOF
 	},
 	{
@@ -55,7 +49,7 @@ EOF
 		devpath		=> "/block/sda/sda1",
 		exp_name	=> "boot_disk1" ,
 		conf		=> <<EOF
-BUS="scsi", SYSFS{vendor}="IBM-ESXS", NAME="boot_disk%n"
+BUS=="scsi", SYSFS{vendor}=="IBM-ESXS", NAME="boot_disk%n"
 EOF
 	},
 	{
@@ -64,10 +58,10 @@ EOF
 		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"
-BUS="scsi", SYSFS{vendor}="IBM-ESXSS", NAME="boot_disk%n-3"
+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"
+BUS=="scsi", SYSFS{vendor}=="IBM-ESXSS", NAME="boot_disk%n-3"
 EOF
 	},
 	{
@@ -76,8 +70,8 @@ EOF
 		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"
+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
 	},
 	{
@@ -86,8 +80,8 @@ EOF
 		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"
+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
 	},
 	{
@@ -96,7 +90,7 @@ EOF
 		devpath		=> "/class/tty/ttyUSB0",
 		exp_name	=> "visor/0" ,
 		conf		=> <<EOF
-KERNEL="ttyUSB*", NAME="visor/%n"
+KERNEL=="ttyUSB*", NAME="visor/%n"
 EOF
 	},
 	{
@@ -105,8 +99,8 @@ EOF
 		devpath		=> "/class/tty/ttyUSB0",
 		exp_name	=> "visor/0" ,
 		conf		=> <<EOF
-KERNEL="*USB1", NAME="bad"
-KERNEL="*USB0", NAME="visor/%n"
+KERNEL=="*USB1", NAME="bad"
+KERNEL=="*USB0", NAME="visor/%n"
 EOF
 	},
 	{
@@ -115,9 +109,9 @@ EOF
 		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"
+KERNEL=="ttyUSB??*", NAME="visor/%n-1"
+KERNEL=="ttyUSB??", NAME="visor/%n-2"
+KERNEL=="ttyUSB?", NAME="visor/%n"
 EOF
 	},
 	{
@@ -126,9 +120,9 @@ EOF
 		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"
+KERNEL=="ttyUSB[A-Z]*", NAME="visor/%n-1"
+KERNEL=="ttyUSB?[0-9]", NAME="visor/%n-2"
+KERNEL=="ttyUSB[0-9]*", NAME="visor/%n"
 EOF
 	},
 	{
@@ -137,7 +131,7 @@ EOF
 		devpath		=> "/class/tty/ttyUSB0",
 		exp_name	=> "visor" ,
 		conf		=> <<EOF
-KERNEL="ttyUSB0", NAME="visor"
+KERNEL=="ttyUSB0", NAME="visor"
 EOF
 	},
 	{
@@ -147,7 +141,7 @@ EOF
 		exp_name	=> "visor" ,
 		conf		=> <<EOF
 # this is a comment
-KERNEL="ttyUSB0", NAME="visor"
+KERNEL=="ttyUSB0", NAME="visor"
 
 EOF
 	},
@@ -158,7 +152,7 @@ EOF
 		exp_name	=> "visor" ,
 		conf		=> <<EOF
  # this is a comment with whitespace before the comment 
-KERNEL="ttyUSB0", NAME="visor"
+KERNEL=="ttyUSB0", NAME="visor"
 
 EOF
 	},
@@ -172,7 +166,7 @@ EOF
  
 
  # this is a comment with whitespace before the comment 
-KERNEL="ttyUSB0", NAME="whitespace"
+KERNEL=="ttyUSB0", NAME="whitespace"
 
  
 
@@ -185,7 +179,46 @@ EOF
 		exp_name	=> "visor" ,
 		conf		=> <<EOF
 
-KERNEL="ttyUSB0", NAME="visor"
+KERNEL=="ttyUSB0", NAME="visor"
+
+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
 	},
@@ -195,7 +228,7 @@ EOF
 		devpath		=> "/class/tty/ttyUSB0",
 		exp_name	=> "sub/direct/ory/visor" ,
 		conf		=> <<EOF
-KERNEL="ttyUSB0", NAME="sub/direct/ory/visor"
+KERNEL=="ttyUSB0", NAME="sub/direct/ory/visor"
 EOF
 	},
 	{
@@ -204,7 +237,7 @@ EOF
 		devpath		=> "/block/sda/sda3",
 		exp_name	=> "first_disk3" ,
 		conf		=> <<EOF
-BUS="scsi", PLACE="0:0:0:0", NAME="first_disk%n"
+BUS=="scsi", ID=="0:0:0:0", NAME="first_disk%n"
 EOF
 	},
 	{
@@ -213,7 +246,7 @@ EOF
 		devpath		=> "/block/sda/sda3",
 		exp_name	=> "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"
+BUS=="scsi", ID=="0:0:0:0", NAME="Major:%M:minor:%m:kernelnumber:%n:bus:%b"
 EOF
 	},
 	{
@@ -222,16 +255,7 @@ EOF
 		devpath		=> "/block/sda/sda3",
 		exp_name	=> "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",
-		exp_name	=> "good" ,
-		conf		=> <<EOF
-BUS="scsi", SYSFS_vendor="IBM-ESXS", NAME="good"
+BUS=="scsi", ID=="0:0:0:0", NAME="M%M-m%m-n%n-b%3b-s%3s{vendor}"
 EOF
 	},
 	{
@@ -240,8 +264,8 @@ EOF
 		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"
+BUS=="scsi", SYSFS{vendor}=="IBM-ESXS", NAME="disk-%s{vendor}-%k"
+KERNEL=="ttyUSB0", NAME="visor"
 EOF
 	},
 	{
@@ -250,11 +274,11 @@ EOF
 		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"
-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"
+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"
+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
 	},
 	{
@@ -263,7 +287,7 @@ EOF
 		devpath		=> "/block/sda/sda3",
 		exp_name	=> "subsys_block" ,
 		conf		=> <<EOF
-BUS="scsi", PROGRAM="/bin/echo", RESULT="block", NAME="subsys_block"
+BUS=="scsi", PROGRAM=="/bin/echo", RESULT=="block", NAME="subsys_block"
 EOF
 	},
 	{
@@ -272,7 +296,7 @@ EOF
 		devpath		=> "/block/sda/sda3",
 		exp_name	=> "newline_removed" ,
 		conf		=> <<EOF
-BUS="scsi", PROGRAM="/bin/echo test", RESULT="test", NAME="newline_removed"
+BUS=="scsi", PROGRAM=="/bin/echo test", RESULT=="test", NAME="newline_removed"
 EOF
 	},
 	{
@@ -281,7 +305,7 @@ EOF
 		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"
+BUS=="scsi", PROGRAM=="/bin/echo -n test-%b", RESULT=="test-0:0*", NAME="%c"
 EOF
 	},
 	{
@@ -290,7 +314,7 @@ EOF
 		devpath		=> "/block/sda/sda3",
 		exp_name	=> "escape-3" ,
 		conf		=> <<EOF
-BUS="scsi", PROGRAM="/bin/echo -n escape-%%n", KERNEL="sda3", NAME="%c"
+BUS=="scsi", PROGRAM=="/bin/echo -n escape-%%n", KERNEL=="sda3", NAME="%c"
 EOF
 	},
 	{
@@ -299,7 +323,7 @@ EOF
 		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}"
+BUS=="scsi", PROGRAM=="/bin/echo -n foo3 foo4 foo5 foo6 foo7 foo8 foo9", KERNEL=="sda3", NAME="%c{7}"
 EOF
 	},
 	{
@@ -308,7 +332,7 @@ EOF
 		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}"
+BUS=="scsi", PROGRAM=="/bin/sh -c 'echo foo3 foo4 foo5 foo6 foo7 foo8 foo9 | sed  s/foo9/bar9/'", KERNEL=="sda3", NAME="%c{7}"
 EOF
 	},
 	{
@@ -317,7 +341,7 @@ EOF
 		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}"
+BUS=="scsi", PROGRAM=="/bin/echo -n 'foo3 foo4'   'foo5   foo6   foo7 foo8'", KERNEL=="sda3", NAME="%c{5}"
 EOF
 	},
 	{
@@ -326,7 +350,7 @@ EOF
 		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}"
+BUS=="scsi", PROGRAM=="/bin/echo -n foo3 foo4 foo5 foo6 foo7 foo8 foo9", KERNEL=="sda3", NAME="my-%c{7}"
 EOF
 	},
 	{
@@ -335,7 +359,7 @@ EOF
 		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}"
+BUS=="scsi", PROGRAM=="/bin/echo -n foo3 foo4 foo5 foo6 foo7 foo8 foo9", KERNEL=="sda3", NAME="my-%c{6}"
 EOF
 	},
 	{
@@ -344,8 +368,8 @@ EOF
 		devpath		=> "/class/tty/console",
 		exp_name	=> "TTY" ,
 		conf		=> <<EOF
-BUS="scsi", PROGRAM="/bin/echo -n foo", RESULT="foo", NAME="foo"
-KERNEL="console", NAME="TTY"
+BUS=="scsi", PROGRAM=="/bin/echo -n foo", RESULT=="foo", NAME="foo"
+KERNEL=="console", NAME="TTY"
 EOF
 	},
 	{
@@ -354,8 +378,8 @@ EOF
 		devpath		=> "/class/tty/console",
 		exp_name	=> "foo" ,
 		conf		=> <<EOF
-PROGRAM="/bin/echo -n foo", RESULT="foo", NAME="foo"
-KERNEL="console", NAME="TTY"
+PROGRAM=="/bin/echo -n foo", RESULT=="foo", NAME="foo"
+KERNEL=="console", NAME="TTY"
 EOF
 	},
 	{
@@ -364,8 +388,8 @@ EOF
 		devpath		=> "/class/tty/console",
 		exp_name	=> "TTY" ,
 		conf		=> <<EOF
-BUS="foo", SYSFS{dev}="5:1", NAME="foo"
-KERNEL="console", NAME="TTY"
+BUS=="foo", SYSFS{dev}=="5:1", NAME="foo"
+KERNEL=="console", NAME="TTY"
 EOF
 	},
 	{
@@ -374,8 +398,8 @@ EOF
 		devpath		=> "/class/tty/console",
 		exp_name	=> "foo" ,
 		conf		=> <<EOF
-SYSFS{dev}="5:1", NAME="foo"
-KERNEL="console", NAME="TTY"
+SYSFS{dev}=="5:1", NAME="foo"
+KERNEL=="console", NAME="TTY"
 EOF
 	},
 	{
@@ -384,9 +408,9 @@ EOF
 		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"
+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
 	},
 	{
@@ -395,7 +419,7 @@ EOF
 		devpath		=> "/block/sda",
 		exp_name	=> "boot_disk15" ,
 		conf		=> <<EOF
-BUS="scsi", SYSFS{vendor}="IBM-ESXS", NAME{all_partitions}="boot_disk"
+BUS=="scsi", SYSFS{vendor}=="IBM-ESXS", NAME{all_partitions}="boot_disk"
 EOF
 	},
 	{
@@ -404,7 +428,7 @@ EOF
 		devpath		=> "/class/tty/ttyUSB0",
 		exp_name	=> "visor" ,
 		conf		=> <<EOF
-SYSFS{idProduct}="2008", NAME="visor"
+SYSFS{idProduct}=="2008", NAME="visor"
 EOF
 	},
 	{
@@ -413,8 +437,8 @@ EOF
 		devpath		=> "/block/rd!c0d0",
 		exp_name	=> "rd/c0d0" ,
 		conf		=> <<EOF
-BUS="scsi", NAME="%k"
-KERNEL="ttyUSB0", NAME="visor"
+BUS=="scsi", NAME="%k"
+KERNEL=="ttyUSB0", NAME="visor"
 EOF
 	},
 	{
@@ -423,7 +447,7 @@ EOF
 		devpath		=> "/block/rd!c0d0",
 		exp_name	=> "rd/c0d0" ,
 		conf		=> <<EOF
-KERNEL="ttyUSB0", NAME="visor"
+KERNEL=="ttyUSB0", NAME="visor"
 EOF
 	},
 	{
@@ -432,8 +456,8 @@ EOF
 		devpath		=> "/block/cciss!c0d0/cciss!c0d0p1",
 		exp_name	=> "cciss/c0d0p1" ,
 		conf		=> <<EOF
-BUS="scsi", NAME="%k"
-KERNEL="ttyUSB0", NAME="visor"
+BUS=="scsi", NAME="%k"
+KERNEL=="ttyUSB0", NAME="visor"
 EOF
 	},
 	{
@@ -442,11 +466,11 @@ EOF
 		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"
-BUS="scsi", ID="/0:0:0:0", NAME="no-match"
-BUS="scsi", ID="0:0:0:0", NAME="scsi-0:0:0:0"
+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"
+BUS=="scsi", ID=="/0:0:0:0", NAME="no-match"
+BUS=="scsi", ID=="0:0:0:0", NAME="scsi-0:0:0:0"
 EOF
 	},
 	{
@@ -455,11 +479,11 @@ EOF
 		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"
-BUS="scsi", ID="*", NAME="scsi-0:0:0:0"
-BUS="scsi", ID="0:0:0:0", NAME="bad"
+BUS=="scsi", ID=="*:1", NAME="no-match"
+BUS=="scsi", ID=="*:0:1", NAME="no-match"
+BUS=="scsi", ID=="*:0:0:1", NAME="no-match"
+BUS=="scsi", ID=="*", NAME="scsi-0:0:0:0"
+BUS=="scsi", ID=="0:0:0:0", NAME="bad"
 EOF
 	},
 	{
@@ -468,8 +492,8 @@ EOF
 		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"
+BUS=="scsi", ID=="*:0", NAME="scsi-0:0:0:0"
+BUS=="scsi", ID=="0:0:0:0", NAME="bad"
 EOF
 	},
 	{
@@ -478,8 +502,8 @@ EOF
 		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"
+BUS=="scsi", ID=="*:0:0:0", NAME="scsi-0:0:0:0"
+BUS=="scsi", ID=="0:0:0:0", NAME="bad"
 EOF
 	},
 	{
@@ -488,7 +512,7 @@ EOF
 		devpath		=> "/block/sda",
 		exp_name	=> "ignored",
 		conf		=> <<EOF
-BUS="scsi", SYSFS{whitespace_test}="WHITE  SPACE", NAME="ignored"
+BUS=="scsi", SYSFS{whitespace_test}=="WHITE  SPACE", NAME="ignored"
 EOF
 	},
 	{
@@ -497,8 +521,8 @@ EOF
 		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"
+BUS=="scsi", SYSFS{whitespace_test}=="WHITE  SPACE ", NAME="wrong-to-ignore"
+BUS=="scsi", SYSFS{whitespace_test}=="WHITE  SPACE   ", NAME="matched-with-space"
 EOF
 	},
 	{
@@ -506,9 +530,9 @@ EOF
 		subsys		=> "tty",
 		devpath		=> "/class/tty/tty33",
 		exp_name	=> "tty33",
-		exp_perms	=> "0:0:0600",
+		exp_perms	=> "0:0:0660",
 		conf		=> <<EOF
-KERNEL="tty33", NAME="tty33", OWNER="bad", GROUP="name"
+KERNEL=="tty33", NAME="tty33", OWNER="bad", GROUP="name"
 EOF
 	},
 	{
@@ -516,9 +540,9 @@ EOF
 		subsys		=> "block",
 		devpath		=> "/block/sda",
 		exp_name	=> "node",
-		exp_perms	=> "5000::0600",
+		exp_perms	=> "5000::0660",
 		conf		=> <<EOF
-BUS="scsi", KERNEL="sda", NAME="node", OWNER="5000"
+BUS=="scsi", KERNEL=="sda", NAME="node", OWNER="5000"
 EOF
 	},
 	{
@@ -526,9 +550,39 @@ EOF
 		subsys		=> "block",
 		devpath		=> "/block/sda",
 		exp_name	=> "node",
-		exp_perms	=> ":100:0600",
+		exp_perms	=> ":100:0660",
+		conf		=> <<EOF
+BUS=="scsi", KERNEL=="sda", NAME="node", GROUP="100"
+EOF
+	},
+	{
+		desc		=> "textual user id",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "node",
+		exp_perms	=> "nobody::0660",
+		conf		=> <<EOF
+BUS=="scsi", KERNEL=="sda", NAME="node", OWNER="nobody"
+EOF
+	},
+	{
+		desc		=> "textual group id",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "node",
+		exp_perms	=> ":daemon:0660",
+		conf		=> <<EOF
+BUS=="scsi", KERNEL=="sda", NAME="node", GROUP="daemon"
+EOF
+	},
+	{
+		desc		=> "textual user/group id",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "node",
+		exp_perms	=> "root:mail:0660",
 		conf		=> <<EOF
-BUS="scsi", KERNEL="sda", NAME="node", GROUP="100"
+BUS=="scsi", KERNEL=="sda", NAME="node", OWNER="root", GROUP="mail"
 EOF
 	},
 	{
@@ -538,7 +592,7 @@ EOF
 		exp_name	=> "node",
 		exp_perms	=> "::0777",
 		conf		=> <<EOF
-BUS="scsi", KERNEL="sda", NAME="node", MODE="0777"
+BUS=="scsi", KERNEL=="sda", NAME="node", MODE="0777"
 EOF
 	},
 	{
@@ -548,7 +602,7 @@ EOF
 		exp_name	=> "node",
 		exp_perms	=> "5000:100:0777",
 		conf		=> <<EOF
-BUS="scsi", KERNEL="sda", NAME="node", OWNER="5000", GROUP="100", MODE="0777"
+BUS=="scsi", KERNEL=="sda", NAME="node", OWNER="5000", GROUP="100", MODE="0777"
 EOF
 	},
 	{
@@ -558,7 +612,7 @@ EOF
 		exp_name	=> "ttyUSB0",
 		exp_perms	=> "5000::",
 		conf		=> <<EOF
-KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", OWNER="5000"
+KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", OWNER="5000"
 EOF
 	},
 	{
@@ -566,9 +620,9 @@ EOF
 		subsys		=> "tty",
 		devpath		=> "/class/tty/ttyUSB0",
 		exp_name	=> "ttyUSB0",
-		exp_perms	=> ":100:0600",
+		exp_perms	=> ":100:0660",
 		conf		=> <<EOF
-KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", GROUP="100"
+KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", GROUP="100"
 EOF
 	},
 	{
@@ -578,7 +632,7 @@ EOF
 		exp_name	=> "ttyUSB0",
 		exp_perms	=> "::0060",
 		conf		=> <<EOF
-KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", MODE="0060"
+KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", MODE="0060"
 EOF
 	},
 	{
@@ -588,7 +642,47 @@ EOF
 		exp_name	=> "ttyUSB0",
 		exp_perms	=> "5000:100:0777",
 		conf		=> <<EOF
-KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", OWNER="5000", GROUP="100", MODE="0777"
+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
 	},
 	{
@@ -598,7 +692,7 @@ EOF
 		exp_name	=> "node",
 		exp_majorminor	=> "8:0",
 		conf		=> <<EOF
-BUS="scsi", KERNEL="sda", NAME="node"
+BUS=="scsi", KERNEL=="sda", NAME="node"
 EOF
 	},
 	{
@@ -608,7 +702,7 @@ EOF
 		exp_name	=> "node",
 		exp_majorminor	=> "89:300",
 		conf		=> <<EOF
-KERNEL="i2c-300", NAME="node"
+KERNEL=="i2c-300", NAME="node"
 EOF
 	},
 	{
@@ -618,7 +712,7 @@ EOF
 		exp_name	=> "node",
 		exp_majorminor	=> "4095:1",
 		conf		=> <<EOF
-KERNEL="i2c-fake1", NAME="node"
+KERNEL=="i2c-fake1", NAME="node"
 EOF
 	},
 	{
@@ -628,7 +722,7 @@ EOF
 		exp_name	=> "node",
 		exp_majorminor	=> "4094:89999",
 		conf		=> <<EOF
-KERNEL="i2c-fake2", NAME="node"
+KERNEL=="i2c-fake2", NAME="node"
 EOF
 	},
 	{
@@ -638,7 +732,7 @@ EOF
 		exp_name	=> "symlink2-ttyUSB0",
 		exp_target	=> "ttyUSB0",
 		conf		=> <<EOF
-KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="symlink1-%n symlink2-%k symlink3-%b"
+KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="symlink1-%n symlink2-%k symlink3-%b"
 EOF
 	},
 	{
@@ -648,7 +742,7 @@ EOF
 		exp_name	=> "visor0",
 		exp_target	=> "ttyUSB0",
 		conf		=> <<EOF
-KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="visor%n"
+KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="visor%n"
 EOF
 	},
 	{
@@ -658,7 +752,7 @@ EOF
 		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"
+BUS=="scsi", SYSFS{vendor}=="IBM-ESXS", NAME="1/2/a/b/node", SYMLINK="1/2/symlink"
 EOF
 	},
 	{
@@ -668,7 +762,7 @@ EOF
 		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"
+BUS=="scsi", SYSFS{vendor}=="IBM-ESXS", NAME="1/2/a/b/node", SYMLINK="1/2/c/d/symlink"
 EOF
 	},
 	{
@@ -678,7 +772,7 @@ EOF
 		exp_name	=> "second-0" ,
 		exp_target	=> "visor" ,
 		conf		=> <<EOF
-KERNEL="ttyUSB0", NAME="visor", SYMLINK="first-%n second-%n third-%n"
+KERNEL=="ttyUSB0", NAME="visor", SYMLINK="first-%n second-%n third-%n"
 EOF
 	},
 	{
@@ -688,20 +782,9 @@ EOF
 		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 empty",
-		subsys		=> "block",
-		devpath		=> "/block/sda",
-		exp_name	=> "",
-		exp_target	=> "link",
-		exp_error	=> "yes",
-		conf		=> <<EOF
-BUS="scsi", KERNEL="sda", NAME="link", SYMLINK=""
+BUS=="scsi", KERNEL=="sda", SYMLINK="symlink-only1"
+BUS=="scsi", KERNEL=="sda", SYMLINK="symlink-only2"
+BUS=="scsi", KERNEL=="sda", NAME="link", SYMLINK="symlink0"
 EOF
 	},
 	{
@@ -710,31 +793,10 @@ EOF
 		devpath		=> "/block/sda",
 		exp_name	=> ".",
 		exp_target	=> "link",
-		exp_error	=> "yes",
+		exp_add_error	=> "yes",
+		exp_rem_error	=> "yes",
 		conf		=> <<EOF
-BUS="scsi", KERNEL="sda", NAME="link", SYMLINK="."
-EOF
-	},
-	{
-		desc		=> "symlink to empty name",
-		subsys		=> "block",
-		devpath		=> "/block/sda",
-		exp_name	=> "symlink",
-		exp_target	=> "",
-		exp_error	=> "yes",
-		conf		=> <<EOF
-BUS="scsi", KERNEL="sda", NAME="", SYMLINK="symlink"
-EOF
-	},
-	{
-		desc		=> "symlink and name empty",
-		subsys		=> "block",
-		devpath		=> "/block/sda",
-		exp_name	=> "",
-		exp_target	=> "",
-		exp_error	=> "yes",
-		conf		=> <<EOF
-BUS="scsi", KERNEL="sda", NAME="", SYMLINK=""
+BUS=="scsi", KERNEL=="sda", NAME="link", SYMLINK="."
 EOF
 	},
 	{
@@ -743,8 +805,10 @@ EOF
 		devpath		=> "/class/tty/tty0",
 		exp_name	=> "link",
 		exp_target	=> "link",
+		exp_rem_error	=> "yes",
+		option		=> "clear",
 		conf		=> <<EOF
-KERNEL="tty0", NAME="link", SYMLINK="link"
+KERNEL=="tty0", NAME="link", SYMLINK="link"
 EOF
 	},
 	{
@@ -754,7 +818,7 @@ EOF
 		exp_name	=> "symlink0",
 		exp_target	=> "ttyUSB0",
 		conf		=> <<EOF
-KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="symlink%n"
+KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="symlink%n"
 EOF
 	},
 	{
@@ -764,7 +828,7 @@ EOF
 		exp_name	=> "symlink-ttyUSB0",
 		exp_target	=> "ttyUSB0",
 		conf		=> <<EOF
-KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="symlink-%k"
+KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="symlink-%k"
 EOF
 	},
 	{
@@ -774,7 +838,7 @@ EOF
 		exp_name	=> "major-188:0",
 		exp_target	=> "ttyUSB0",
 		conf		=> <<EOF
-KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="major-%M:%m"
+KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="major-%M:%m"
 EOF
 	},
 	{
@@ -784,7 +848,7 @@ EOF
 		exp_name	=> "symlink-0:0:0:0",
 		exp_target	=> "node",
 		conf		=> <<EOF
-BUS="scsi", KERNEL="sda", NAME="node", SYMLINK="symlink-%b"
+BUS=="scsi", KERNEL=="sda", NAME="node", SYMLINK="symlink-%b"
 EOF
 	},
 	{
@@ -794,7 +858,7 @@ EOF
 		exp_name	=> "test",
 		exp_target	=> "ttyUSB0",
 		conf		=> <<EOF
-KERNEL="ttyUSB[0-9]*", PROGRAM="/bin/echo test" NAME="ttyUSB%n", SYMLINK="%c"
+KERNEL=="ttyUSB[0-9]*", PROGRAM=="/bin/echo test" NAME="ttyUSB%n", SYMLINK="%c"
 EOF
 	},
 	{
@@ -804,7 +868,7 @@ EOF
 		exp_name	=> "test",
 		exp_target	=> "ttyUSB0",
 		conf		=> <<EOF
-KERNEL="ttyUSB[0-9]*", PROGRAM="/bin/echo symlink test this" NAME="ttyUSB%n", SYMLINK="%c{2}"
+KERNEL=="ttyUSB[0-9]*", PROGRAM=="/bin/echo symlink test this" NAME="ttyUSB%n", SYMLINK="%c{2}"
 EOF
 	},
 	{
@@ -814,7 +878,7 @@ EOF
 		exp_name	=> "this",
 		exp_target	=> "ttyUSB0",
 		conf		=> <<EOF
-KERNEL="ttyUSB[0-9]*", PROGRAM="/bin/echo symlink test this" NAME="ttyUSB%n", SYMLINK="%c{2+}"
+KERNEL=="ttyUSB[0-9]*", PROGRAM=="/bin/echo symlink test this" NAME="ttyUSB%n", SYMLINK="%c{2+}"
 EOF
 	},
 	{
@@ -824,8 +888,8 @@ EOF
 		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"
+BUS=="scsi", KERNEL=="sda", PROGRAM=="/bin/echo link test this" SYMLINK="%c{2+}"
+BUS=="scsi", KERNEL=="sda", NAME="link", SYMLINK="symlink0"
 EOF
 	},
 	{
@@ -835,7 +899,7 @@ EOF
 		exp_name	=> "188:0",
 		exp_target	=> "ttyUSB0",
 		conf		=> <<EOF
-KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="%s{dev}"
+KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="%s{dev}"
 EOF
 	},
 	{
@@ -845,7 +909,7 @@ EOF
 		exp_name	=> "188",
 		exp_target	=> "ttyUSB0",
 		conf		=> <<EOF
-KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="%3s{dev}"
+KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="%3s{dev}"
 EOF
 	},
 	{
@@ -855,7 +919,7 @@ EOF
 		exp_name	=> "percent%sign",
 		exp_target	=> "ttyUSB0",
 		conf		=> <<EOF
-KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="percent%%sign"
+KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="percent%%sign"
 EOF
 	},
 	{
@@ -865,7 +929,7 @@ EOF
 		exp_name	=> "%ttyUSB0_name",
 		exp_target	=> "ttyUSB0",
 		conf		=> <<EOF
-KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="%%%k_name"
+KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="%%%k_name"
 EOF
 	},
 	{
@@ -875,7 +939,7 @@ EOF
 		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}"
+BUS=="scsi", PROGRAM=="/bin/echo -n node link1 link2", RESULT=="node *", NAME="%c{1}", SYMLINK="%c{2} %c{3}"
 EOF
 	},
 	{
@@ -885,7 +949,7 @@ EOF
 		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+}"
+BUS=="scsi", PROGRAM=="/bin/echo -n node link1 link2 link3 link4", RESULT=="node *", NAME="%c{1}", SYMLINK="%c{2+}"
 EOF
 	},
 	{
@@ -894,17 +958,17 @@ EOF
 		devpath		=> "/block/sda",
 		exp_name	=> "cdrom",
 		conf		=> <<EOF
-KERNEL="sda", NAME="cdrom%e"
+KERNEL=="sda", NAME="cdrom%e"
 EOF
 	},
 	{
-		desc		=> "enumeration char test sequence (1/5 keep)",
+		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"
+KERNEL=="sda", NAME="cdrom%e"
 EOF
 	},
 	{
@@ -914,7 +978,7 @@ EOF
 		exp_name	=> "enum",
 		option		=> "keep",
 		conf		=> <<EOF
-KERNEL="sda1", NAME="enum%e"
+KERNEL=="sda1", NAME="enum%e"
 EOF
 	},
 	{
@@ -924,7 +988,7 @@ EOF
 		exp_name	=> "cdrom1",
 		option		=> "keep",
 		conf		=> <<EOF
-KERNEL="sda2", NAME="cdrom%e"
+KERNEL=="sda2", NAME="cdrom%e"
 EOF
 	},
 	{
@@ -934,7 +998,7 @@ EOF
 		exp_name	=> "enum1",
 		option		=> "keep",
 		conf		=> <<EOF
-KERNEL="sda3", NAME="enum%e"
+KERNEL=="sda3", NAME="enum%e"
 EOF
 	},
 	{
@@ -944,7 +1008,7 @@ EOF
 		exp_name	=> "cdrom2",
 		option		=> "clear",
 		conf		=> <<EOF
-KERNEL="sda4", NAME="cdrom%e"
+KERNEL=="sda4", NAME="cdrom%e"
 EOF
 	},
 	{
@@ -953,7 +1017,38 @@ EOF
 		devpath		=> "/block/sda",
 		exp_name	=> "cdrom",
 		conf		=> <<EOF
-KERNEL="sda", NAME="cdrom%e"
+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
 	},
 	{
@@ -961,9 +1056,9 @@ EOF
 		subsys		=> "block",
 		devpath		=> "/block/sda",
 		exp_name	=> "node",
-		exp_error	=> "yes",
+		exp_rem_error	=> "yes",
 		conf		=> <<EOF
-BUS="scsi", KERNEL="sda", NAME{ignore_remove}="node"
+BUS=="scsi", KERNEL=="sda", NAME="node", OPTIONS="ignore_remove"
 EOF
 	},
 	{
@@ -971,10 +1066,10 @@ EOF
 		subsys		=> "block",
 		devpath		=> "/block/sda",
 		exp_name	=> "node14",
-		exp_error	=> "yes",
+		exp_rem_error	=> "yes",
 		option		=> "clear",
 		conf		=> <<EOF
-BUS="scsi", KERNEL="sda", NAME{ignore_remove, all_partitions}="node"
+BUS=="scsi", KERNEL=="sda", NAME="node", OPTIONS="ignore_remove, all_partitions"
 EOF
 	},
 	{
@@ -983,9 +1078,9 @@ EOF
 		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"
+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
 	},
 	{
@@ -994,8 +1089,130 @@ EOF
 		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"
+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
+	},
+	{
+		desc		=> "negation KERNEL!=",
+		subsys		=> "block",
+		devpath		=> "/block/sda/sda1",
+		exp_name	=> "match",
+		conf		=> <<EOF
+BUS=="scsi", KERNEL!="sda1", NAME="matches-but-is-negated"
+BUS=="scsi", KERNEL!="xsda1", NAME="match"
+BUS=="scsi", KERNEL=="sda1", NAME="wrong"
+EOF
+	},
+	{
+		desc		=> "negation SUBSYSTEM!=",
+		subsys		=> "block",
+		devpath		=> "/block/sda/sda1",
+		exp_name	=> "not-anything",
+		conf		=> <<EOF
+BUS=="scsi", SUBSYSTEM=="block", KERNEL!="sda1", NAME="matches-but-is-negated"
+BUS=="scsi", SUBSYSTEM!="anything", NAME="not-anything"
+BUS=="scsi", KERNEL=="sda1", NAME="wrong"
+EOF
+	},
+	{
+		desc		=> "negation PROGRAM!= exit code",
+		subsys		=> "block",
+		devpath		=> "/block/sda/sda1",
+		exp_name	=> "nonzero-program",
+		conf		=> <<EOF
+KERNEL=="sda1", PROGRAM!="/bin/false", NAME="nonzero-program"
+BUS=="scsi", KERNEL=="sda1", NAME="wrong"
+EOF
+	},
+	{
+		desc		=> "test for whitespace between the operator",
+		subsys		=> "block",
+		devpath		=> "/block/sda/sda1",
+		exp_name	=> "true",
+		conf		=> <<EOF
+KERNEL   ==   "sda1"     ,    NAME   =    "true"
+BUS=="scsi", KERNEL=="sda1", NAME="wrong"
+EOF
+	},
+	{
+		desc		=> "ENV{} test",
+		subsys		=> "block",
+		devpath		=> "/block/sda/sda1",
+		exp_name	=> "true",
+		conf		=> <<EOF
+BUS=="scsi", KERNEL=="sda1", ENV{UDEV_TEST}=="go", NAME="wrong"
+BUS=="scsi", KERNEL=="sda1", ENV{UDEV_TEST}=="yes", NAME="true"
+BUS=="scsi", KERNEL=="sda1", ENV{UDEV_TEST}=="bad", NAME="bad"
+EOF
+	},
+	{
+		desc		=> "ENV{} test",
+		subsys		=> "block",
+		devpath		=> "/block/sda/sda1",
+		exp_name	=> "true",
+		conf		=> <<EOF
+BUS=="scsi", KERNEL=="sda1", ENV{UDEV_TEST}=="go", NAME="wrong"
+BUS=="scsi", KERNEL=="sda1", ENV{UDEV_TEST}=="yes", ENV{ACTION}=="add", ENV{DEVPATH}=="/block/sda/sdax1", NAME="no"
+BUS=="scsi", KERNEL=="sda1", ENV{UDEV_TEST}=="yes", ENV{ACTION}=="add", ENV{DEVPATH}=="/block/sda/sda1", NAME="true"
+BUS=="scsi", KERNEL=="sda1", ENV{UDEV_TEST}=="bad", NAME="bad"
 EOF
 	},
 );
@@ -1028,21 +1245,35 @@ sub permissions_test {
 	my($config, $uid, $gid, $mode) = @_;
 
 	my $wrong = 0;
+	my $userid;
+	my $groupid;
+
 	$config->{exp_perms} =~ m/^(.*):(.*):(.*)$/;
 	if ($1 ne "") {
-		if ($uid != $1) { $wrong = 1; };
+		if (defined(getpwnam($1))) {
+			$userid = int(getpwnam($1));
+		} else {
+			$userid = $1;
+		}
+		if ($uid != $userid) { $wrong = 1; }
 	}
 	if ($2 ne "") {
-		if ($gid != $2) { $wrong = 1; };
+		if (defined(getgrnam($2))) {
+			$groupid = int(getgrnam($2));
+		} else {
+			$groupid = $2;
+		}
+		if ($gid != $groupid) { $wrong = 1; }
 	}
 	if ($3 ne "") {
 		if (($mode & 07777) != oct($3)) { $wrong = 1; };
 	}
 	if ($wrong == 0) {
-		print "permissions: ok    ";
+		print "permissions: ok\n";
 	} 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;
+		printf "  expected permissions are: %s:%s:%#o\n", $1, $2, oct($3);
+		printf "  created permissions are : %i:%i:%#o\n", $uid, $gid, $mode & 07777;
+		print "permissions: error\n";
 		$error++;
 	}
 }
@@ -1062,11 +1293,11 @@ sub major_minor_test {
 		if ($minor != $2) { $wrong = 1; };
 	}
 	if ($wrong == 0) {
-		print "major:minor: ok    ";
+		print "major:minor: ok\n";
 	} 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    ";
+		printf "  expected major:minor is: %i:%i\n", $1, $2;
+		printf "  created major:minor is : %i:%i\n", $major, $minor;
+		print "major:minor: error\n";
 		$error++;
 	}
 }
@@ -1078,22 +1309,25 @@ sub symlink_test {
 
 	if ($output =~ m/(.*)-> (.*)/) {
 		if ($2 eq $config->{exp_target}) {
-			print "symlink: ok    ";
+			print "symlink:     ok\n";
 		} 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_error}) {
-				print "as expected    ";
+			print "  expected symlink from: \'$config->{exp_name}\' to \'$config->{exp_target}\'\n";
+			print "  created symlink from: \'$config->{exp_name}\' to \'$2\'\n";
+			print "symlink: error";
+			if ($config->{exp_add_error}) {
+				print " as expected\n";
 			} else {
+				print "\n";
 				$error++;
 			}
 		}
 	} else {
-		print "expected symlink from: \'$config->{exp_name}\' to \'$config->{exp_target}\'\n";
-		print "symlink: not created ";
-		if ($config->{exp_error}) {
-			print "as expected    ";
+		print "  expected symlink from: \'$config->{exp_name}\' to \'$config->{exp_target}\'\n";
+		print "symlink:     not created";
+		if ($config->{exp_add_error}) {
+			print " as expected\n";
 		} else {
+			print "\n";
 			$error++;
 		}
 	}
@@ -1127,13 +1361,13 @@ sub run_test {
 		if (defined($config->{exp_target})) {
 			symlink_test($config);
 		}
-		print "add: ok    ";
+		print "add:         ok\n";
 	} else {
-		print "add: error ";
-		if ($config->{exp_error}) {
-			print "as expected    ";
+		print "add:         error";
+		if ($config->{exp_add_error}) {
+			print " as expected\n";
 		} else {
-			print "\n\n";
+			print "\n";
 			system("tree $udev_root");
 			print "\n";
 			$error++;
@@ -1148,19 +1382,21 @@ sub run_test {
 	udev("remove", $config->{subsys}, $config->{devpath}, \$config->{conf});
 	if ((-e "$PWD/$udev_root$config->{exp_name}") ||
 	    (-l "$PWD/$udev_root$config->{exp_name}")) {
-		print "remove: error ";
-		if ($config->{exp_error}) {
-			print "as expected\n\n";
+		print "remove:      error";
+		if ($config->{exp_rem_error}) {
+			print " as expected\n";
 		} else {
-			print "\n\n";
+			print "\n";
 			system("tree $udev_root");
 			print "\n";
 			$error++;
 		}
 	} else {
-		print "remove: ok\n\n";
+		print "remove:      ok\n";
 	}
 
+	print "\n";
+
 	if (defined($config->{option}) && $config->{option} eq "clear") {
 		system("rm -rf $udev_db");
 		system("rm -rf $udev_root");
@@ -1185,9 +1421,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 "default_mode=\"0600\"\n";
-print CONF "default_owner=\"root\"\n";
-print CONF "default_group=\"root\"\n";
 close CONF;
 
 my $test_num = 1;