chiark / gitweb /
[PATCH] add RUN key to be able to run rule based notification
[elogind.git] / test / udev-test.pl
index 5a519ef13b40145e57e6839f4f788c05c809e3a6..91e91bb2ae34bd7ea6129ba94996cfb40aa29104 100644 (file)
@@ -9,30 +9,24 @@
 # Every test is driven by its own temporary config file.
 # This program prepares the environment, creates the config and calls udev.
 #
-# udev reads the config, looks at the provided sysfs and
+# udev parses the rules, looks at the provided sysfs and
 # first creates and then removes the device node.
 # 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;
 
-my $PWD = $ENV{PWD};
-my $sysfs     = "sys/";
-my $udev_bin  = "../udev";
-my $udev_root = "udev-root/"; # !!! directory will be removed !!!
-my $udev_db   = ".udevdb";
-my $main_conf = "udev-test.conf";
-my $conf_tmp  = "udev-test.rules";
+my $PWD                = $ENV{PWD};
+my $sysfs      = "sys/";
+my $udev_bin   = "../udev";
+my $udev_root  = "udev-root/"; # !!! directory will be removed !!!
+my $udev_db    = ".udevdb";
+my $udev_conf  = "udev-test.conf";
+my $udev_rules = "udev-test.rules";
 
 # uncomment following line to run udev with valgrind.
 # Should make this a runtime option to the script someday...
@@ -44,9 +38,9 @@ my @tests = (
                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"
+               rules           => <<EOF
+BUS=="scsi", SYSFS{vendor}=="IBM-ESXS", NAME="boot_disk%n"
+KERNEL=="ttyUSB0", NAME="visor"
 EOF
        },
        {
@@ -54,8 +48,8 @@ EOF
                subsys          => "block",
                devpath         => "/block/sda/sda1",
                exp_name        => "boot_disk1" ,
-               conf            => <<EOF
-BUS="scsi", SYSFS{vendor}="IBM-ESXS", NAME="boot_disk%n"
+               rules           => <<EOF
+BUS=="scsi", SYSFS{vendor}=="IBM-ESXS", NAME="boot_disk%n"
 EOF
        },
        {
@@ -63,11 +57,11 @@ EOF
                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"
-BUS="scsi", SYSFS{vendor}="IBM-ESXSS", NAME="boot_disk%n-3"
+               rules           => <<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"
 EOF
        },
        {
@@ -75,9 +69,9 @@ EOF
                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"
+               rules           => <<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
        },
        {
@@ -85,9 +79,9 @@ EOF
                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"
+               rules           => <<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
        },
        {
@@ -95,8 +89,8 @@ EOF
                subsys          => "tty",
                devpath         => "/class/tty/ttyUSB0",
                exp_name        => "visor/0" ,
-               conf            => <<EOF
-KERNEL="ttyUSB*", NAME="visor/%n"
+               rules           => <<EOF
+KERNEL=="ttyUSB*", NAME="visor/%n"
 EOF
        },
        {
@@ -104,9 +98,9 @@ EOF
                subsys          => "tty",
                devpath         => "/class/tty/ttyUSB0",
                exp_name        => "visor/0" ,
-               conf            => <<EOF
-KERNEL="*USB1", NAME="bad"
-KERNEL="*USB0", NAME="visor/%n"
+               rules           => <<EOF
+KERNEL=="*USB1", NAME="bad"
+KERNEL=="*USB0", NAME="visor/%n"
 EOF
        },
        {
@@ -114,10 +108,10 @@ EOF
                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"
+               rules           => <<EOF
+KERNEL=="ttyUSB??*", NAME="visor/%n-1"
+KERNEL=="ttyUSB??", NAME="visor/%n-2"
+KERNEL=="ttyUSB?", NAME="visor/%n"
 EOF
        },
        {
@@ -125,10 +119,10 @@ EOF
                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"
+               rules           => <<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
        },
        {
@@ -136,8 +130,8 @@ EOF
                subsys          => "tty",
                devpath         => "/class/tty/ttyUSB0",
                exp_name        => "visor" ,
-               conf            => <<EOF
-KERNEL="ttyUSB0", NAME="visor"
+               rules           => <<EOF
+KERNEL=="ttyUSB0", NAME="visor"
 EOF
        },
        {
@@ -145,9 +139,9 @@ EOF
                subsys          => "tty",
                devpath         => "/class/tty/ttyUSB0",
                exp_name        => "visor" ,
-               conf            => <<EOF
+               rules           => <<EOF
 # this is a comment
-KERNEL="ttyUSB0", NAME="visor"
+KERNEL=="ttyUSB0", NAME="visor"
 
 EOF
        },
@@ -156,9 +150,9 @@ EOF
                subsys          => "tty",
                devpath         => "/class/tty/ttyUSB0",
                exp_name        => "visor" ,
-               conf            => <<EOF
+               rules           => <<EOF
  # this is a comment with whitespace before the comment 
-KERNEL="ttyUSB0", NAME="visor"
+KERNEL=="ttyUSB0", NAME="visor"
 
 EOF
        },
@@ -167,12 +161,12 @@ EOF
                subsys          => "tty",
                devpath         => "/class/tty/ttyUSB0",
                exp_name        => "whitespace" ,
-               conf            => <<EOF
+               rules           => <<EOF
 
  
 
  # this is a comment with whitespace before the comment 
-KERNEL="ttyUSB0", NAME="whitespace"
+KERNEL=="ttyUSB0", NAME="whitespace"
 
  
 
@@ -183,9 +177,9 @@ EOF
                subsys          => "tty",
                devpath         => "/class/tty/ttyUSB0",
                exp_name        => "visor" ,
-               conf            => <<EOF
+               rules           => <<EOF
 
-KERNEL="ttyUSB0", NAME="visor"
+KERNEL=="ttyUSB0", NAME="visor"
 
 EOF
        },
@@ -194,10 +188,19 @@ EOF
                subsys          => "tty",
                devpath         => "/class/tty/ttyUSB0",
                exp_name        => "visor" ,
-               conf            => <<EOF
-KERNEL="ttyUSB0", \\
+               rules           => <<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",
+               rules           => <<EOF
+KERNEL=="ttyUSB0", PROGRAM=="/bin/echo -e \\101", RESULT=="A", NAME="aaa"
 EOF
        },
        {
@@ -205,7 +208,7 @@ EOF
                subsys          => "tty",
                devpath         => "/class/tty/ttyUSB0",
                exp_name        => "visor" ,
-               conf            => <<EOF
+               rules           => <<EOF
 
 #
 \\
@@ -214,7 +217,7 @@ EOF
 
 #\\
 
-KERNEL="ttyUSB0", \\
+KERNEL=="ttyUSB0", \\
        NAME="visor"
 
 EOF
@@ -224,8 +227,8 @@ EOF
                subsys          => "tty",
                devpath         => "/class/tty/ttyUSB0",
                exp_name        => "sub/direct/ory/visor" ,
-               conf            => <<EOF
-KERNEL="ttyUSB0", NAME="sub/direct/ory/visor"
+               rules           => <<EOF
+KERNEL=="ttyUSB0", NAME="sub/direct/ory/visor"
 EOF
        },
        {
@@ -233,8 +236,8 @@ EOF
                subsys          => "block",
                devpath         => "/block/sda/sda3",
                exp_name        => "first_disk3" ,
-               conf            => <<EOF
-BUS="scsi", PLACE="0:0:0:0", NAME="first_disk%n"
+               rules           => <<EOF
+BUS=="scsi", ID=="0:0:0:0", NAME="first_disk%n"
 EOF
        },
        {
@@ -242,8 +245,8 @@ EOF
                subsys          => "block",
                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"
+               rules           => <<EOF
+BUS=="scsi", ID=="0:0:0:0", NAME="Major:%M:minor:%m:kernelnumber:%n:bus:%b"
 EOF
        },
        {
@@ -251,17 +254,8 @@ EOF
                subsys          => "block",
                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"
+               rules           => <<EOF
+BUS=="scsi", ID=="0:0:0:0", NAME="M%M-m%m-n%n-b%3b-s%3s{vendor}"
 EOF
        },
        {
@@ -269,9 +263,9 @@ EOF
                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"
+               rules           => <<EOF
+BUS=="scsi", SYSFS{vendor}=="IBM-ESXS", NAME="disk-%s{vendor}-%k"
+KERNEL=="ttyUSB0", NAME="visor"
 EOF
        },
        {
@@ -279,12 +273,12 @@ EOF
                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"
-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"
+               rules           => <<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"
 EOF
        },
        {
@@ -292,8 +286,8 @@ EOF
                subsys          => "block",
                devpath         => "/block/sda/sda3",
                exp_name        => "subsys_block" ,
-               conf            => <<EOF
-BUS="scsi", PROGRAM="/bin/echo", RESULT="block", NAME="subsys_block"
+               rules           => <<EOF
+BUS=="scsi", PROGRAM=="/bin/echo", RESULT=="block", NAME="subsys_block"
 EOF
        },
        {
@@ -301,8 +295,8 @@ EOF
                subsys          => "block",
                devpath         => "/block/sda/sda3",
                exp_name        => "newline_removed" ,
-               conf            => <<EOF
-BUS="scsi", PROGRAM="/bin/echo test", RESULT="test", NAME="newline_removed"
+               rules           => <<EOF
+BUS=="scsi", PROGRAM=="/bin/echo test", RESULT=="test", NAME="newline_removed"
 EOF
        },
        {
@@ -310,8 +304,8 @@ EOF
                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"
+               rules           => <<EOF
+BUS=="scsi", PROGRAM=="/bin/echo -n test-%b", RESULT=="test-0:0*", NAME="%c"
 EOF
        },
        {
@@ -319,8 +313,8 @@ EOF
                subsys          => "block",
                devpath         => "/block/sda/sda3",
                exp_name        => "escape-3" ,
-               conf            => <<EOF
-BUS="scsi", PROGRAM="/bin/echo -n escape-%%n", KERNEL="sda3", NAME="%c"
+               rules           => <<EOF
+BUS=="scsi", PROGRAM=="/bin/echo -n escape-%%n", KERNEL=="sda3", NAME="%c"
 EOF
        },
        {
@@ -328,8 +322,8 @@ EOF
                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}"
+               rules           => <<EOF
+BUS=="scsi", PROGRAM=="/bin/echo -n foo3 foo4 foo5 foo6 foo7 foo8 foo9", KERNEL=="sda3", NAME="%c{7}"
 EOF
        },
        {
@@ -337,8 +331,8 @@ EOF
                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}"
+               rules           => <<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
        },
        {
@@ -346,8 +340,8 @@ EOF
                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}"
+               rules           => <<EOF
+BUS=="scsi", PROGRAM=="/bin/echo -n 'foo3 foo4'   'foo5   foo6   foo7 foo8'", KERNEL=="sda3", NAME="%c{5}"
 EOF
        },
        {
@@ -355,8 +349,8 @@ EOF
                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}"
+               rules           => <<EOF
+BUS=="scsi", PROGRAM=="/bin/echo -n foo3 foo4 foo5 foo6 foo7 foo8 foo9", KERNEL=="sda3", NAME="my-%c{7}"
 EOF
        },
        {
@@ -364,8 +358,8 @@ EOF
                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}"
+               rules           => <<EOF
+BUS=="scsi", PROGRAM=="/bin/echo -n foo3 foo4 foo5 foo6 foo7 foo8 foo9", KERNEL=="sda3", NAME="my-%c{6}"
 EOF
        },
        {
@@ -373,9 +367,9 @@ EOF
                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"
+               rules           => <<EOF
+BUS=="scsi", PROGRAM=="/bin/echo -n foo", RESULT=="foo", NAME="foo"
+KERNEL=="console", NAME="TTY"
 EOF
        },
        {
@@ -383,9 +377,9 @@ EOF
                subsys          => "tty",
                devpath         => "/class/tty/console",
                exp_name        => "foo" ,
-               conf            => <<EOF
-PROGRAM="/bin/echo -n foo", RESULT="foo", NAME="foo"
-KERNEL="console", NAME="TTY"
+               rules           => <<EOF
+PROGRAM=="/bin/echo -n foo", RESULT=="foo", NAME="foo"
+KERNEL=="console", NAME="TTY"
 EOF
        },
        {
@@ -393,9 +387,9 @@ EOF
                subsys          => "tty",
                devpath         => "/class/tty/console",
                exp_name        => "TTY" ,
-               conf            => <<EOF
-BUS="foo", SYSFS{dev}="5:1", NAME="foo"
-KERNEL="console", NAME="TTY"
+               rules           => <<EOF
+BUS=="foo", SYSFS{dev}=="5:1", NAME="foo"
+KERNEL=="console", NAME="TTY"
 EOF
        },
        {
@@ -403,9 +397,9 @@ EOF
                subsys          => "tty",
                devpath         => "/class/tty/console",
                exp_name        => "foo" ,
-               conf            => <<EOF
-SYSFS{dev}="5:1", NAME="foo"
-KERNEL="console", NAME="TTY"
+               rules           => <<EOF
+SYSFS{dev}=="5:1", NAME="foo"
+KERNEL=="console", NAME="TTY"
 EOF
        },
        {
@@ -413,10 +407,10 @@ EOF
                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"
+               rules           => <<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
        },
        {
@@ -424,8 +418,8 @@ EOF
                subsys          => "block",
                devpath         => "/block/sda",
                exp_name        => "boot_disk15" ,
-               conf            => <<EOF
-BUS="scsi", SYSFS{vendor}="IBM-ESXS", NAME{all_partitions}="boot_disk"
+               rules           => <<EOF
+BUS=="scsi", SYSFS{vendor}=="IBM-ESXS", NAME{all_partitions}="boot_disk"
 EOF
        },
        {
@@ -433,8 +427,8 @@ EOF
                subsys          => "tty",
                devpath         => "/class/tty/ttyUSB0",
                exp_name        => "visor" ,
-               conf            => <<EOF
-SYSFS{idProduct}="2008", NAME="visor"
+               rules           => <<EOF
+SYSFS{idProduct}=="2008", NAME="visor"
 EOF
        },
        {
@@ -442,9 +436,9 @@ EOF
                subsys          => "block",
                devpath         => "/block/rd!c0d0",
                exp_name        => "rd/c0d0" ,
-               conf            => <<EOF
-BUS="scsi", NAME="%k"
-KERNEL="ttyUSB0", NAME="visor"
+               rules           => <<EOF
+BUS=="scsi", NAME="%k"
+KERNEL=="ttyUSB0", NAME="visor"
 EOF
        },
        {
@@ -452,8 +446,8 @@ EOF
                subsys          => "block",
                devpath         => "/block/rd!c0d0",
                exp_name        => "rd/c0d0" ,
-               conf            => <<EOF
-KERNEL="ttyUSB0", NAME="visor"
+               rules           => <<EOF
+KERNEL=="ttyUSB0", NAME="visor"
 EOF
        },
        {
@@ -461,9 +455,9 @@ EOF
                subsys          => "block",
                devpath         => "/block/cciss!c0d0/cciss!c0d0p1",
                exp_name        => "cciss/c0d0p1" ,
-               conf            => <<EOF
-BUS="scsi", NAME="%k"
-KERNEL="ttyUSB0", NAME="visor"
+               rules           => <<EOF
+BUS=="scsi", NAME="%k"
+KERNEL=="ttyUSB0", NAME="visor"
 EOF
        },
        {
@@ -471,12 +465,12 @@ EOF
                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"
-BUS="scsi", ID="/0:0:0:0", NAME="no-match"
-BUS="scsi", ID="0:0:0:0", NAME="scsi-0:0:0:0"
+               rules           => <<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"
 EOF
        },
        {
@@ -484,12 +478,12 @@ EOF
                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"
-BUS="scsi", ID="*", NAME="scsi-0:0:0:0"
-BUS="scsi", ID="0:0:0:0", NAME="bad"
+               rules           => <<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"
 EOF
        },
        {
@@ -497,9 +491,9 @@ EOF
                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"
+               rules           => <<EOF
+BUS=="scsi", ID=="*:0", NAME="scsi-0:0:0:0"
+BUS=="scsi", ID=="0:0:0:0", NAME="bad"
 EOF
        },
        {
@@ -507,9 +501,9 @@ EOF
                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"
+               rules           => <<EOF
+BUS=="scsi", ID=="*:0:0:0", NAME="scsi-0:0:0:0"
+BUS=="scsi", ID=="0:0:0:0", NAME="bad"
 EOF
        },
        {
@@ -517,8 +511,8 @@ EOF
                subsys          => "block",
                devpath         => "/block/sda",
                exp_name        => "ignored",
-               conf            => <<EOF
-BUS="scsi", SYSFS{whitespace_test}="WHITE  SPACE", NAME="ignored"
+               rules           => <<EOF
+BUS=="scsi", SYSFS{whitespace_test}=="WHITE  SPACE", NAME="ignored"
 EOF
        },
        {
@@ -526,9 +520,9 @@ EOF
                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"
+               rules           => <<EOF
+BUS=="scsi", SYSFS{whitespace_test}=="WHITE  SPACE ", NAME="wrong-to-ignore"
+BUS=="scsi", SYSFS{whitespace_test}=="WHITE  SPACE   ", NAME="matched-with-space"
 EOF
        },
        {
@@ -537,8 +531,8 @@ EOF
                devpath         => "/class/tty/tty33",
                exp_name        => "tty33",
                exp_perms       => "0:0:0660",
-               conf            => <<EOF
-KERNEL="tty33", NAME="tty33", OWNER="bad", GROUP="name"
+               rules           => <<EOF
+KERNEL=="tty33", NAME="tty33", OWNER="bad", GROUP="name"
 EOF
        },
        {
@@ -547,8 +541,8 @@ EOF
                devpath         => "/block/sda",
                exp_name        => "node",
                exp_perms       => "5000::0660",
-               conf            => <<EOF
-BUS="scsi", KERNEL="sda", NAME="node", OWNER="5000"
+               rules           => <<EOF
+BUS=="scsi", KERNEL=="sda", NAME="node", OWNER="5000"
 EOF
        },
        {
@@ -557,8 +551,38 @@ EOF
                devpath         => "/block/sda",
                exp_name        => "node",
                exp_perms       => ":100:0660",
-               conf            => <<EOF
-BUS="scsi", KERNEL="sda", NAME="node", GROUP="100"
+               rules           => <<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",
+               rules           => <<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",
+               rules           => <<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",
+               rules           => <<EOF
+BUS=="scsi", KERNEL=="sda", NAME="node", OWNER="root", GROUP="mail"
 EOF
        },
        {
@@ -567,8 +591,8 @@ EOF
                devpath         => "/block/sda",
                exp_name        => "node",
                exp_perms       => "::0777",
-               conf            => <<EOF
-BUS="scsi", KERNEL="sda", NAME="node", MODE="0777"
+               rules           => <<EOF
+BUS=="scsi", KERNEL=="sda", NAME="node", MODE="0777"
 EOF
        },
        {
@@ -577,8 +601,8 @@ EOF
                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"
+               rules           => <<EOF
+BUS=="scsi", KERNEL=="sda", NAME="node", OWNER="5000", GROUP="100", MODE="0777"
 EOF
        },
        {
@@ -587,8 +611,8 @@ EOF
                devpath         => "/class/tty/ttyUSB0",
                exp_name        => "ttyUSB0",
                exp_perms       => "5000::",
-               conf            => <<EOF
-KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", OWNER="5000"
+               rules           => <<EOF
+KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", OWNER="5000"
 EOF
        },
        {
@@ -597,8 +621,8 @@ EOF
                devpath         => "/class/tty/ttyUSB0",
                exp_name        => "ttyUSB0",
                exp_perms       => ":100:0660",
-               conf            => <<EOF
-KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", GROUP="100"
+               rules           => <<EOF
+KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", GROUP="100"
 EOF
        },
        {
@@ -607,8 +631,8 @@ EOF
                devpath         => "/class/tty/ttyUSB0",
                exp_name        => "ttyUSB0",
                exp_perms       => "::0060",
-               conf            => <<EOF
-KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", MODE="0060"
+               rules           => <<EOF
+KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", MODE="0060"
 EOF
        },
        {
@@ -617,8 +641,8 @@ EOF
                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"
+               rules           => <<EOF
+KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", OWNER="5000", GROUP="100", MODE="0777"
 EOF
        },
        {
@@ -627,10 +651,10 @@ EOF
                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"
+               rules           => <<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
        },
        {
@@ -639,12 +663,12 @@ EOF
                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"
+               rules           => <<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
        },
        {
@@ -653,12 +677,12 @@ EOF
                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"
+               rules           => <<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
        },
        {
@@ -667,8 +691,8 @@ EOF
                devpath         => "/block/sda",
                exp_name        => "node",
                exp_majorminor  => "8:0",
-               conf            => <<EOF
-BUS="scsi", KERNEL="sda", NAME="node"
+               rules           => <<EOF
+BUS=="scsi", KERNEL=="sda", NAME="node"
 EOF
        },
        {
@@ -677,8 +701,8 @@ EOF
                devpath         => "/class/i2c-dev/i2c-300",
                exp_name        => "node",
                exp_majorminor  => "89:300",
-               conf            => <<EOF
-KERNEL="i2c-300", NAME="node"
+               rules           => <<EOF
+KERNEL=="i2c-300", NAME="node"
 EOF
        },
        {
@@ -687,8 +711,8 @@ EOF
                devpath         => "/class/i2c-dev/i2c-fake1",
                exp_name        => "node",
                exp_majorminor  => "4095:1",
-               conf            => <<EOF
-KERNEL="i2c-fake1", NAME="node"
+               rules           => <<EOF
+KERNEL=="i2c-fake1", NAME="node"
 EOF
        },
        {
@@ -697,8 +721,8 @@ EOF
                devpath         => "/class/i2c-dev/i2c-fake2",
                exp_name        => "node",
                exp_majorminor  => "4094:89999",
-               conf            => <<EOF
-KERNEL="i2c-fake2", NAME="node"
+               rules           => <<EOF
+KERNEL=="i2c-fake2", NAME="node"
 EOF
        },
        {
@@ -707,8 +731,8 @@ EOF
                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"
+               rules           => <<EOF
+KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="symlink1-%n symlink2-%k symlink3-%b"
 EOF
        },
        {
@@ -717,8 +741,8 @@ EOF
                devpath         => "/class/tty/ttyUSB0",
                exp_name        => "visor0",
                exp_target      => "ttyUSB0",
-               conf            => <<EOF
-KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="visor%n"
+               rules           => <<EOF
+KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="visor%n"
 EOF
        },
        {
@@ -727,8 +751,8 @@ EOF
                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"
+               rules           => <<EOF
+BUS=="scsi", SYSFS{vendor}=="IBM-ESXS", NAME="1/2/a/b/node", SYMLINK="1/2/symlink"
 EOF
        },
        {
@@ -737,8 +761,8 @@ EOF
                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"
+               rules           => <<EOF
+BUS=="scsi", SYSFS{vendor}=="IBM-ESXS", NAME="1/2/a/b/node", SYMLINK="1/2/c/d/symlink"
 EOF
        },
        {
@@ -747,8 +771,8 @@ EOF
                devpath         => "/class/tty/ttyUSB0",
                exp_name        => "second-0" ,
                exp_target      => "visor" ,
-               conf            => <<EOF
-KERNEL="ttyUSB0", NAME="visor", SYMLINK="first-%n second-%n third-%n"
+               rules           => <<EOF
+KERNEL=="ttyUSB0", NAME="visor", SYMLINK="first-%n second-%n third-%n"
 EOF
        },
        {
@@ -757,21 +781,10 @@ EOF
                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 empty",
-               subsys          => "block",
-               devpath         => "/block/sda",
-               exp_name        => "",
-               exp_target      => "link",
-               exp_error       => "yes",
-               conf            => <<EOF
-BUS="scsi", KERNEL="sda", NAME="link", SYMLINK=""
+               rules           => <<EOF
+BUS=="scsi", KERNEL=="sda", SYMLINK="symlink-only1"
+BUS=="scsi", KERNEL=="sda", SYMLINK="symlink-only2"
+BUS=="scsi", KERNEL=="sda", NAME="link", SYMLINK="symlink0"
 EOF
        },
        {
@@ -780,31 +793,10 @@ EOF
                devpath         => "/block/sda",
                exp_name        => ".",
                exp_target      => "link",
-               exp_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=""
+               exp_add_error   => "yes",
+               exp_rem_error   => "yes",
+               rules           => <<EOF
+BUS=="scsi", KERNEL=="sda", NAME="link", SYMLINK="."
 EOF
        },
        {
@@ -813,8 +805,10 @@ EOF
                devpath         => "/class/tty/tty0",
                exp_name        => "link",
                exp_target      => "link",
-               conf            => <<EOF
-KERNEL="tty0", NAME="link", SYMLINK="link"
+               exp_rem_error   => "yes",
+               option          => "clean",
+               rules           => <<EOF
+KERNEL=="tty0", NAME="link", SYMLINK="link"
 EOF
        },
        {
@@ -823,8 +817,8 @@ EOF
                devpath         => "/class/tty/ttyUSB0",
                exp_name        => "symlink0",
                exp_target      => "ttyUSB0",
-               conf            => <<EOF
-KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="symlink%n"
+               rules           => <<EOF
+KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="symlink%n"
 EOF
        },
        {
@@ -833,8 +827,8 @@ EOF
                devpath         => "/class/tty/ttyUSB0",
                exp_name        => "symlink-ttyUSB0",
                exp_target      => "ttyUSB0",
-               conf            => <<EOF
-KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="symlink-%k"
+               rules           => <<EOF
+KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="symlink-%k"
 EOF
        },
        {
@@ -843,8 +837,8 @@ EOF
                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"
+               rules           => <<EOF
+KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="major-%M:%m"
 EOF
        },
        {
@@ -853,8 +847,8 @@ EOF
                devpath         => "/block/sda",
                exp_name        => "symlink-0:0:0:0",
                exp_target      => "node",
-               conf            => <<EOF
-BUS="scsi", KERNEL="sda", NAME="node", SYMLINK="symlink-%b"
+               rules           => <<EOF
+BUS=="scsi", KERNEL=="sda", NAME="node", SYMLINK="symlink-%b"
 EOF
        },
        {
@@ -863,8 +857,8 @@ EOF
                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"
+               rules           => <<EOF
+KERNEL=="ttyUSB[0-9]*", PROGRAM=="/bin/echo test" NAME="ttyUSB%n", SYMLINK="%c"
 EOF
        },
        {
@@ -873,8 +867,8 @@ EOF
                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}"
+               rules           => <<EOF
+KERNEL=="ttyUSB[0-9]*", PROGRAM=="/bin/echo symlink test this" NAME="ttyUSB%n", SYMLINK="%c{2}"
 EOF
        },
        {
@@ -883,8 +877,8 @@ EOF
                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+}"
+               rules           => <<EOF
+KERNEL=="ttyUSB[0-9]*", PROGRAM=="/bin/echo symlink test this" NAME="ttyUSB%n", SYMLINK="%c{2+}"
 EOF
        },
        {
@@ -893,9 +887,9 @@ EOF
                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"
+               rules           => <<EOF
+BUS=="scsi", KERNEL=="sda", PROGRAM=="/bin/echo link test this" SYMLINK="%c{2+}"
+BUS=="scsi", KERNEL=="sda", NAME="link", SYMLINK="symlink0"
 EOF
        },
        {
@@ -904,8 +898,8 @@ EOF
                devpath         => "/class/tty/ttyUSB0",
                exp_name        => "188:0",
                exp_target      => "ttyUSB0",
-               conf            => <<EOF
-KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="%s{dev}"
+               rules           => <<EOF
+KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="%s{dev}"
 EOF
        },
        {
@@ -914,8 +908,8 @@ EOF
                devpath         => "/class/tty/ttyUSB0",
                exp_name        => "188",
                exp_target      => "ttyUSB0",
-               conf            => <<EOF
-KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="%3s{dev}"
+               rules           => <<EOF
+KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="%3s{dev}"
 EOF
        },
        {
@@ -924,8 +918,8 @@ EOF
                devpath         => "/class/tty/ttyUSB0",
                exp_name        => "percent%sign",
                exp_target      => "ttyUSB0",
-               conf            => <<EOF
-KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="percent%%sign"
+               rules           => <<EOF
+KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="percent%%sign"
 EOF
        },
        {
@@ -934,8 +928,8 @@ EOF
                devpath         => "/class/tty/ttyUSB0",
                exp_name        => "%ttyUSB0_name",
                exp_target      => "ttyUSB0",
-               conf            => <<EOF
-KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="%%%k_name"
+               rules           => <<EOF
+KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="%%%k_name"
 EOF
        },
        {
@@ -944,8 +938,8 @@ EOF
                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}"
+               rules           => <<EOF
+BUS=="scsi", PROGRAM=="/bin/echo -n node link1 link2", RESULT=="node *", NAME="%c{1}", SYMLINK="%c{2} %c{3}"
 EOF
        },
        {
@@ -954,8 +948,8 @@ EOF
                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+}"
+               rules           => <<EOF
+BUS=="scsi", PROGRAM=="/bin/echo -n node link1 link2 link3 link4", RESULT=="node *", NAME="%c{1}", SYMLINK="%c{2+}"
 EOF
        },
        {
@@ -963,8 +957,8 @@ EOF
                subsys          => "block",
                devpath         => "/block/sda",
                exp_name        => "cdrom",
-               conf            => <<EOF
-KERNEL="sda", NAME="cdrom%e"
+               rules           => <<EOF
+KERNEL=="sda", NAME="cdrom%e"
 EOF
        },
        {
@@ -973,8 +967,8 @@ EOF
                devpath         => "/block/sda",
                exp_name        => "cdrom",
                option          => "keep",
-               conf            => <<EOF
-KERNEL="sda", NAME="cdrom%e"
+               rules           => <<EOF
+KERNEL=="sda", NAME="cdrom%e"
 EOF
        },
        {
@@ -983,8 +977,8 @@ EOF
                devpath         => "/block/sda/sda1",
                exp_name        => "enum",
                option          => "keep",
-               conf            => <<EOF
-KERNEL="sda1", NAME="enum%e"
+               rules           => <<EOF
+KERNEL=="sda1", NAME="enum%e"
 EOF
        },
        {
@@ -993,8 +987,8 @@ EOF
                devpath         => "/block/sda/sda2",
                exp_name        => "cdrom1",
                option          => "keep",
-               conf            => <<EOF
-KERNEL="sda2", NAME="cdrom%e"
+               rules           => <<EOF
+KERNEL=="sda2", NAME="cdrom%e"
 EOF
        },
        {
@@ -1003,8 +997,8 @@ EOF
                devpath         => "/block/sda/sda3",
                exp_name        => "enum1",
                option          => "keep",
-               conf            => <<EOF
-KERNEL="sda3", NAME="enum%e"
+               rules           => <<EOF
+KERNEL=="sda3", NAME="enum%e"
 EOF
        },
        {
@@ -1012,9 +1006,9 @@ EOF
                subsys          => "block",
                devpath         => "/block/sda/sda4",
                exp_name        => "cdrom2",
-               option          => "clear",
-               conf            => <<EOF
-KERNEL="sda4", NAME="cdrom%e"
+               option          => "clean",
+               rules           => <<EOF
+KERNEL=="sda4", NAME="cdrom%e"
 EOF
        },
        {
@@ -1022,8 +1016,39 @@ EOF
                subsys          => "block",
                devpath         => "/block/sda",
                exp_name        => "cdrom",
-               conf            => <<EOF
-KERNEL="sda", NAME="cdrom%e"
+               rules           => <<EOF
+KERNEL=="sda", NAME="cdrom%e"
+EOF
+       },
+       {
+               desc            => "ignore rule test",
+               subsys          => "block",
+               devpath         => "/block/sda",
+               exp_name        => "node",
+               exp_add_error   => "yes",
+               rules           => <<EOF
+BUS=="scsi", KERNEL=="sda", NAME="node", OPTIONS="ignore"
+EOF
+       },
+       {
+               desc            => "all_partitions, option-only rule",
+               subsys          => "block",
+               devpath         => "/block/sda",
+               exp_name        => "node6",
+               rules           => <<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",
+               rules           => <<EOF
+SUBSYSTEM=="block", OPTIONS="all_partitions"
+BUS=="scsi", KERNEL=="sda", NAME="node"
 EOF
        },
        {
@@ -1031,9 +1056,9 @@ EOF
                subsys          => "block",
                devpath         => "/block/sda",
                exp_name        => "node",
-               exp_error       => "yes",
-               conf            => <<EOF
-BUS="scsi", KERNEL="sda", NAME{ignore_remove}="node"
+               exp_rem_error   => "yes",
+               rules           => <<EOF
+BUS=="scsi", KERNEL=="sda", NAME="node", OPTIONS="ignore_remove"
 EOF
        },
        {
@@ -1041,10 +1066,10 @@ EOF
                subsys          => "block",
                devpath         => "/block/sda",
                exp_name        => "node14",
-               exp_error       => "yes",
-               option          => "clear",
-               conf            => <<EOF
-BUS="scsi", KERNEL="sda", NAME{ignore_remove, all_partitions}="node"
+               exp_rem_error   => "yes",
+               option          => "clean",
+               rules           => <<EOF
+BUS=="scsi", KERNEL=="sda", NAME="node", OPTIONS="ignore_remove, all_partitions"
 EOF
        },
        {
@@ -1052,10 +1077,10 @@ EOF
                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"
+               rules           => <<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
        },
        {
@@ -1063,18 +1088,18 @@ EOF
                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"
+               rules           => <<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        => "sda",
-               conf            => <<EOF
-BUS="scsi", KERNEL="sda", PROGRAM="/usr/bin/test -b %N" NAME="%N"
+               exp_name        => "node",
+               rules           => <<EOF
+BUS=="scsi", KERNEL=="sda", PROGRAM=="/usr/bin/test -b %N" NAME="node"
 EOF
        },
        {
@@ -1082,8 +1107,8 @@ EOF
                subsys          => "block",
                devpath         => "/block/sda",
                exp_name        => "sda",
-               conf            => <<EOF
-BUS="scsi", KERNEL="sda", PROGRAM="/bin/echo %p", RESULT="/block/sda" NAME="%k"
+               rules           => <<EOF
+BUS=="scsi", KERNEL=="sda", PROGRAM=="/bin/echo %p", RESULT=="/block/sda" NAME="%k"
 EOF
        },
        {
@@ -1092,8 +1117,8 @@ EOF
                devpath         => "/block/sda",
                exp_name        => "main_device",
                option          => "keep",
-               conf            => <<EOF
-BUS="scsi", KERNEL="sda", NAME="main_device"
+               rules           => <<EOF
+BUS=="scsi", KERNEL=="sda", NAME="main_device"
 EOF
        },
        {
@@ -1102,8 +1127,8 @@ EOF
                devpath         => "/block/sda/sda1",
                exp_name        => "main_device-part-1",
                option          => "clean",
-               conf            => <<EOF
-BUS="scsi", KERNEL="sda1", NAME="%P-part-1"
+               rules           => <<EOF
+BUS=="scsi", KERNEL=="sda1", NAME="%P-part-1"
 EOF
        },
        {
@@ -1111,29 +1136,180 @@ EOF
                subsys          => "block",
                devpath         => "/block/sda/sda1",
                exp_name        => "start-udev-root-end",
+               rules           => <<EOF
+BUS=="scsi", KERNEL=="sda1", NAME="start-%r-end"
+EOF
+       },
+       {
+               desc            => "last_rule option",
+               subsys          => "block",
+               devpath         => "/block/sda/sda1",
+               exp_name        => "last",
+               rules           => <<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",
+               rules           => <<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",
+               rules           => <<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",
+               rules           => <<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",
+               rules           => <<EOF
+KERNEL   ==   "sda1"     ,    NAME   =    "true"
+BUS=="scsi", KERNEL=="sda1", NAME="wrong"
+EOF
+       },
+       {
+               desc            => "ENV{} test",
+               subsys          => "block",
+               devpath         => "/block/sda/sda1",
+               exp_name        => "true",
+               rules           => <<EOF
+BUS=="scsi", KERNEL=="sda1", ENV{ENV_KEY_TEST}=="go", NAME="wrong"
+BUS=="scsi", KERNEL=="sda1", ENV{ENV_KEY_TEST}=="test", NAME="true"
+BUS=="scsi", KERNEL=="sda1", ENV{ENV_KEY_TEST}=="bad", NAME="bad"
+EOF
+       },
+       {
+               desc            => "ENV{} test",
+               subsys          => "block",
+               devpath         => "/block/sda/sda1",
+               exp_name        => "true",
+               rules           => <<EOF
+BUS=="scsi", KERNEL=="sda1", ENV{ENV_KEY_TEST}=="go", NAME="wrong"
+BUS=="scsi", KERNEL=="sda1", ENV{ENV_KEY_TEST}=="yes", ENV{ACTION}=="add", ENV{DEVPATH}=="/block/sda/sdax1", NAME="no"
+BUS=="scsi", KERNEL=="sda1", ENV{ENV_KEY_TEST}=="test", ENV{ACTION}=="add", ENV{DEVPATH}=="/block/sda/sda1", NAME="true"
+BUS=="scsi", KERNEL=="sda1", ENV{ENV_KEY_TEST}=="bad", NAME="bad"
+EOF
+       },
+       {
+               desc            => "untrusted string sanitize",
+               subsys          => "block",
+               devpath         => "/block/sda/sda1",
+               exp_name        => "sane",
+               rules           => <<EOF
+BUS=="scsi", KERNEL=="sda1", PROGRAM=="/bin/echo -e name; (/sbin/badprogram)", RESULT="name_ _/sbin/badprogram_", NAME="sane"
+EOF
+       },
+       {
+               desc            => "read sysfs value from device down in the chain",
+               subsys          => "block",
+               devpath         => "/class/tty/ttyUSB0",
+               exp_name        => "serial-0000:00:09.0",
+               rules           => <<EOF
+KERNEL=="ttyUSB*", NAME="serial-%s{serial}"
+EOF
+       },
+       {
+               desc            => "match against empty key string",
+               subsys          => "block",
+               devpath         => "/block/sda",
+               exp_name        => "ok",
+               rules           => <<EOF
+KERNEL=="sda", SYSFS{nothing}!="", NAME="not-1-ok"
+KERNEL=="sda", SYSFS{nothing}=="", NAME="not-2-ok"
+KERNEL=="sda", SYSFS{vendor}!="", NAME="ok"
+KERNEL=="sda", SYSFS{vendor}=="", NAME="not-3-ok"
+EOF
+       },
+       {
+               desc            => "check ACTION value",
+               subsys          => "block",
+               devpath         => "/block/sda",
+               exp_name        => "ok",
+               rules           => <<EOF
+ACTION=="unknown", KERNEL=="sda", NAME="unknown-not-ok"
+ACTION=="add", KERNEL=="sda", NAME="ok"
+EOF
+       },
+       {
+               desc            => "apply NAME only once",
+               subsys          => "block",
+               devpath         => "/block/sda",
+               exp_name        => "link",
+               exp_target      => "ok",
+               rules           => <<EOF
+KERNEL=="sda", NAME="ok"
+KERNEL=="sda", NAME="not-ok"
+KERNEL=="sda", SYMLINK+="link"
+EOF
+       },
+       {
+               desc            => "test RUN key",
+               subsys          => "block",
+               devpath         => "/block/sda",
+               exp_name        => "testsymlink",
+               exp_target      => "ok",
+               exp_rem_error   => "yes",
                option          => "clean",
-               conf            => <<EOF
-BUS="scsi", KERNEL="sda1", NAME="start-%r-end"
+               rules           => <<EOF
+KERNEL=="sda", NAME="ok", RUN+="/bin/ln -s ok %r/testsymlink"
+KERNEL=="sda", NAME="not-ok"
+EOF
+       },
+       {
+               desc            => "test RUN key remove",
+               subsys          => "block",
+               devpath         => "/block/sda",
+               exp_name        => "testsymlink2",
+               exp_target      => "ok2",
+               rules           => <<EOF
+KERNEL=="sda", NAME="ok2", RUN+="/bin/ln -s ok2 %r/testsymlink2"
+KERNEL=="sda", ACTION=="remove", RUN+="/bin/rm -f %r/testsymlink2"
+KERNEL=="sda", NAME="not-ok2"
 EOF
        },
 );
 
 # set env
-$ENV{UDEV_TEST} = "yes";
+$ENV{ENV_KEY_TEST} = "test";
 $ENV{SYSFS_PATH} = $sysfs;
-$ENV{UDEV_CONFIG_FILE} = $main_conf;
+$ENV{UDEV_CONFIG_FILE} = $udev_conf;
 $ENV{UDEV_NO_DEVD} = "yes";
 $ENV{UDEV_NO_HOTPLUGD} = "yes";
 
 
 sub udev {
-       my ($action, $subsys, $devpath, $config) = @_;
+       my ($action, $subsys, $devpath, $rules) = @_;
 
        $ENV{DEVPATH} = $devpath;
 
-       # create temporary config
-       open CONF, ">$conf_tmp" || die "unable to create config file: $conf_tmp";
-       print CONF $$config;
+       # create temporary rules
+       open CONF, ">$udev_rules" || die "unable to create rules file: $udev_rules";
+       print CONF $$rules;
        close CONF;
 
        $ENV{ACTION} = $action;
@@ -1143,36 +1319,50 @@ sub udev {
 my $error = 0;
 
 sub permissions_test {
-       my($config, $uid, $gid, $mode) = @_;
+       my($rules, $uid, $gid, $mode) = @_;
 
        my $wrong = 0;
-       $config->{exp_perms} =~ m/^(.*):(.*):(.*)$/;
+       my $userid;
+       my $groupid;
+
+       $rules->{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++;
        }
 }
 
 sub major_minor_test {
-       my($config, $rdev) = @_;
+       my($rules, $rdev) = @_;
 
        my $major = ($rdev >> 8) & 0xfff;
        my $minor = ($rdev & 0xff) | (($rdev >> 12) & 0xfff00);
        my $wrong = 0;
 
-       $config->{exp_majorminor} =~ m/^(.*):(.*)$/;
+       $rules->{exp_majorminor} =~ m/^(.*):(.*)$/;
        if ($1 ne "") {
                if ($major != $1) { $wrong = 1; };
        }
@@ -1180,106 +1370,111 @@ 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++;
        }
 }
 
 sub symlink_test {
-       my ($config) = @_;
+       my ($rules) = @_;
 
-       my $output = `ls -l $PWD/$udev_root$config->{exp_name}`;
+       my $output = `ls -l $PWD/$udev_root$rules->{exp_name}`;
 
        if ($output =~ m/(.*)-> (.*)/) {
-               if ($2 eq $config->{exp_target}) {
-                       print "symlink: ok    ";
+               if ($2 eq $rules->{exp_target}) {
+                       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: \'$rules->{exp_name}\' to \'$rules->{exp_target}\'\n";
+                       print "  created symlink from: \'$rules->{exp_name}\' to \'$2\'\n";
+                       print "symlink: error";
+                       if ($rules->{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: \'$rules->{exp_name}\' to \'$rules->{exp_target}\'\n";
+               print "symlink:     not created";
+               if ($rules->{exp_add_error}) {
+                       print " as expected\n";
                } else {
+                       print "\n";
                        $error++;
                }
        }
 }
 
 sub run_test {
-       my ($config, $number) = @_;
+       my ($rules, $number) = @_;
 
-       print "TEST $number: $config->{desc}\n";
+       print "TEST $number: $rules->{desc}\n";
 
-       if ($config->{exp_target}) {
-               print "device \'$config->{devpath}\' expecting symlink '$config->{exp_name}' to node \'$config->{exp_target}\'\n";
+       if ($rules->{exp_target}) {
+               print "device \'$rules->{devpath}\' expecting symlink '$rules->{exp_name}' to node \'$rules->{exp_target}\'\n";
        } else {
-               print "device \'$config->{devpath}\' expecting node \'$config->{exp_name}\'\n";
+               print "device \'$rules->{devpath}\' expecting node \'$rules->{exp_name}\'\n";
        }
 
 
-       udev("add", $config->{subsys}, $config->{devpath}, \$config->{conf});
-       if ((-e "$PWD/$udev_root$config->{exp_name}") ||
-           (-l "$PWD/$udev_root$config->{exp_name}")) {
+       udev("add", $rules->{subsys}, $rules->{devpath}, \$rules->{rules});
+       if ((-e "$PWD/$udev_root$rules->{exp_name}") ||
+           (-l "$PWD/$udev_root$rules->{exp_name}")) {
 
                my ($dev, $ino, $mode, $nlink, $uid, $gid, $rdev, $size,
-                   $atime, $mtime, $ctime, $blksize, $blocks) = stat("$PWD/$udev_root$config->{exp_name}");
+                   $atime, $mtime, $ctime, $blksize, $blocks) = stat("$PWD/$udev_root$rules->{exp_name}");
 
-               if (defined($config->{exp_perms})) {
-                       permissions_test($config, $uid, $gid, $mode);
+               if (defined($rules->{exp_perms})) {
+                       permissions_test($rules, $uid, $gid, $mode);
                }
-               if (defined($config->{exp_majorminor})) {
-                       major_minor_test($config, $rdev);
+               if (defined($rules->{exp_majorminor})) {
+                       major_minor_test($rules, $rdev);
                }
-               if (defined($config->{exp_target})) {
-                       symlink_test($config);
+               if (defined($rules->{exp_target})) {
+                       symlink_test($rules);
                }
-               print "add: ok    ";
+               print "add:         ok\n";
        } else {
-               print "add: error ";
-               if ($config->{exp_error}) {
-                       print "as expected    ";
+               print "add:         error";
+               if ($rules->{exp_add_error}) {
+                       print " as expected\n";
                } else {
-                       print "\n\n";
+                       print "\n";
                        system("tree $udev_root");
                        print "\n";
                        $error++;
                }
        }
 
-       if (defined($config->{option}) && $config->{option} eq "keep") {
+       if (defined($rules->{option}) && $rules->{option} eq "keep") {
                print "\n\n";
                return;
        }
 
-       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";
+       udev("remove", $rules->{subsys}, $rules->{devpath}, \$rules->{rules});
+       if ((-e "$PWD/$udev_root$rules->{exp_name}") ||
+           (-l "$PWD/$udev_root$rules->{exp_name}")) {
+               print "remove:      error";
+               if ($rules->{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";
        }
 
-       if (defined($config->{option}) && $config->{option} eq "clear") {
+       print "\n";
+
+       if (defined($rules->{option}) && $rules->{option} eq "clean") {
                system("rm -rf $udev_db");
                system("rm -rf $udev_root");
                mkdir($udev_root) || die "unable to create udev_root: $udev_root\n";
@@ -1298,11 +1493,11 @@ if (!($<==0)) {
 system("rm -rf $udev_root");
 mkdir($udev_root) || die "unable to create udev_root: $udev_root\n";
 
-# create initial config file
-open CONF, ">$main_conf" || die "unable to create config file: $main_conf";
+# create config file
+open CONF, ">$udev_conf" || die "unable to create config file: $udev_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_rules=\"$udev_rules\"\n";
 close CONF;
 
 my $test_num = 1;
@@ -1321,8 +1516,8 @@ if ($ARGV[0]) {
        # test all
        print "\nudev-test will run ".($#tests + 1)." tests:\n\n";
 
-       foreach my $config (@tests) {
-               run_test($config, $test_num);
+       foreach my $rules (@tests) {
+               run_test($rules, $test_num);
                $test_num++;
        }
 }
@@ -1332,6 +1527,6 @@ print "$error errors occured\n\n";
 # cleanup
 system("rm -rf $udev_db");
 system("rm -rf $udev_root");
-unlink($conf_tmp);
-unlink($main_conf);
+unlink($udev_rules);
+unlink($udev_conf);