chiark / gitweb /
libudev: handle "device" link as parent, handle "class" "block" as "subsystem"
[elogind.git] / test / udev-test.pl
old mode 100644 (file)
new mode 100755 (executable)
index fe7b932..a83b156
@@ -9,38 +9,55 @@
 # 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.
 #
-# Kay Sievers <kay.sievers@vrfy.org>, 2003
-# Leann Ogasawara <ogasawara@osdl.org>, 2004
+# Copyright (C) 2004-2006 Kay Sievers <kay.sievers@vrfy.org>
+# Copyright (C) 2004 Leann Ogasawara <ogasawara@osdl.org>
 
 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";
-
-# uncomment following line to run udev with valgrind.
-# Should make this a runtime option to the script someday...
-#my $udev_bin  = "valgrind --tool=memcheck --leak-check=yes   ../udev";
+my $PWD                        = $ENV{PWD};
+my $sysfs              = "sys/";
+my $udev_bin           = "../udev/test-udev";
+my $valgrind           = 0;
+my $udev_bin_valgrind  = "valgrind --tool=memcheck --leak-check=yes --quiet $udev_bin";
+my $udev_root          = "udev-root/";
+my $udev_conf          = "udev-test.conf";
+my $udev_rules         = "udev-test.rules";
 
 my @tests = (
+       {
+               desc            => "label test of scsi disc (old key names)",
+               subsys          => "block",
+               devpath         => "/block/sda",
+               exp_name        => "boot_disk" ,
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", SYSFS{vendor}=="IBM-ESXS", NAME="boot_disk%n"
+KERNEL=="ttyUSB0", NAME="visor"
+EOF
+       },
+       {
+               desc            => "label test of scsi disc (old key names)",
+               subsys          => "block",
+               devpath         => "/block/sda",
+               exp_name        => "boot_disk" ,
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", SYSFS{vendor}=="IBM-ESXS", NAME="boot_disk%n"
+KERNEL=="ttyUSB0", NAME="visor"
+EOF
+       },
        {
                desc            => "label test of scsi disc",
                subsys          => "block",
                devpath         => "/block/sda",
                exp_name        => "boot_disk" ,
-               conf            => <<EOF
-BUS="scsi", SYSFS{vendor}="IBM-ESXS", NAME="boot_disk%n"
-KERNEL="ttyUSB0", NAME="visor"
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", ATTRS{vendor}=="IBM-ESXS", NAME="boot_disk%n"
+KERNEL=="ttyUSB0", NAME="visor"
 EOF
        },
        {
@@ -48,8 +65,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
+SUBSYSTEMS=="scsi", ATTRS{vendor}=="IBM-ESXS", NAME="boot_disk%n"
 EOF
        },
        {
@@ -57,11 +74,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
+SUBSYSTEMS=="scsi", ATTRS{vendor}=="?IBM-ESXS", NAME="boot_disk%n-1"
+SUBSYSTEMS=="scsi", ATTRS{vendor}=="IBM-ESXS?", NAME="boot_disk%n-2"
+SUBSYSTEMS=="scsi", ATTRS{vendor}=="IBM-ES??", NAME="boot_disk%n"
+SUBSYSTEMS=="scsi", ATTRS{vendor}=="IBM-ESXSS", NAME="boot_disk%n-3"
 EOF
        },
        {
@@ -69,9 +86,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
+SUBSYSTEMS=="scsi", ATTRS{vendor}=="IBM-ESXS", ATTRS{model}=="ST336605LW   !#", NAME="boot_diskX%n"
+SUBSYSTEMS=="scsi", ATTRS{vendor}=="IBM-ESXS", ATTRS{model}=="ST336605LW    !#", NAME="boot_disk%n"
 EOF
        },
        {
@@ -79,9 +96,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
+SUBSYSTEMS=="scsi", ATTRS{vendor}=="IBM-ESXS", ATTRS{model}=="ST336605LW    !#", ATTRS{scsi_level}=="4", ATTRS{rev}=="B245", ATTRS{type}=="0", ATTRS{queue_depth}=="32", NAME="boot_diskXX%n"
+SUBSYSTEMS=="scsi", ATTRS{vendor}=="IBM-ESXS", ATTRS{model}=="ST336605LW    !#", ATTRS{scsi_level}=="4", ATTRS{rev}=="B245", ATTRS{type}=="0", NAME="boot_disk%n"
 EOF
        },
        {
@@ -89,8 +106,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
        },
        {
@@ -98,9 +115,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
        },
        {
@@ -108,10 +125,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
        },
        {
@@ -119,10 +136,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
        },
        {
@@ -130,8 +147,8 @@ EOF
                subsys          => "tty",
                devpath         => "/class/tty/ttyUSB0",
                exp_name        => "visor" ,
-               conf            => <<EOF
-KERNEL="ttyUSB0", NAME="visor"
+               rules           => <<EOF
+KERNEL=="ttyUSB0", NAME="visor"
 EOF
        },
        {
@@ -139,9 +156,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
        },
@@ -150,9 +167,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
        },
@@ -161,12 +178,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"
 
  
 
@@ -177,9 +194,9 @@ EOF
                subsys          => "tty",
                devpath         => "/class/tty/ttyUSB0",
                exp_name        => "visor" ,
-               conf            => <<EOF
+               rules           => <<EOF
 
-KERNEL="ttyUSB0", NAME="visor"
+KERNEL=="ttyUSB0", NAME="visor"
 
 EOF
        },
@@ -188,10 +205,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
        },
        {
@@ -199,7 +225,7 @@ EOF
                subsys          => "tty",
                devpath         => "/class/tty/ttyUSB0",
                exp_name        => "visor" ,
-               conf            => <<EOF
+               rules           => <<EOF
 
 #
 \\
@@ -208,7 +234,7 @@ EOF
 
 #\\
 
-KERNEL="ttyUSB0", \\
+KERNEL=="ttyUSB0", \\
        NAME="visor"
 
 EOF
@@ -218,76 +244,87 @@ 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
        },
        {
-               desc            => "place on bus of scsi partition",
+               desc            => "parent device name match of scsi partition",
                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
+SUBSYSTEMS=="scsi", KERNELS=="0:0:0:0", NAME="first_disk%n"
 EOF
        },
        {
-               desc            => "test NAME substitution chars",
+               desc            => "test substitution chars (old key names)",
                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"
+               exp_name        => "Major:8:minor:3:kernelnumber:3:id:0:0:0:0" ,
+               rules           => <<EOF
+BUS=="scsi", ID=="0:0:0:0", NAME="Major:%M:minor:%m:kernelnumber:%n:id:%b"
 EOF
        },
        {
-               desc            => "test NAME substitution chars (with length limit)",
+               desc            => "test substitution chars",
+               subsys          => "block",
+               devpath         => "/block/sda/sda3",
+               exp_name        => "Major:8:minor:3:kernelnumber:3:id:0:0:0:0" ,
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", KERNELS=="0:0:0:0", NAME="Major:%M:minor:%m:kernelnumber:%n:id:%b"
+EOF
+       },
+       {
+               desc            => "test substitution chars (with length limit)",
                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}"
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", KERNELS=="0:0:0:0", NAME="M%M-m%m-n%n-b%3b-s%3s{vendor}"
 EOF
        },
        {
-               desc            => "old style SYSFS_ attribute",
+               desc            => "import of shell-value file",
                subsys          => "block",
                devpath         => "/block/sda",
-               exp_name        => "good" ,
-               conf            => <<EOF
-BUS="scsi", SYSFS_vendor="IBM-ESXS", NAME="good"
+               exp_name        => "subdir/err/node" ,
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", IMPORT{file}="udev-test.conf", NAME="subdir/%E{udev_log}/node"
+KERNEL=="ttyUSB0", NAME="visor"
 EOF
        },
        {
-               desc            => "sustitution of sysfs value (%s{file})",
+               desc            => "import of shell-value returned from program",
                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"
+               exp_name        => "node12345678",
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", IMPORT="/bin/echo -e \' TEST_KEY=12345678\\n  TEST_key2=98765\'", NAME="node\$env{TEST_KEY}"
+KERNEL=="ttyUSB0", NAME="visor"
 EOF
        },
        {
-               desc            => "program result substitution",
+               desc            => "sustitution of sysfs value (%s{file})",
                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"
+               devpath         => "/block/sda",
+               exp_name        => "disk-IBM-ESXS-sda" ,
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", ATTRS{vendor}=="IBM-ESXS", NAME="disk-%s{vendor}-%k"
+KERNEL=="ttyUSB0", NAME="visor"
 EOF
        },
        {
-               desc            => "program result substitution (no argument should be subsystem)",
+               desc            => "program result substitution",
                subsys          => "block",
                devpath         => "/block/sda/sda3",
-               exp_name        => "subsys_block" ,
-               conf            => <<EOF
-BUS="scsi", PROGRAM="/bin/echo", RESULT="block", NAME="subsys_block"
+               exp_name        => "special-device-3" ,
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", PROGRAM=="/bin/echo -n special-device", RESULT=="-special-*", NAME="%c-1-%n"
+SUBSYSTEMS=="scsi", PROGRAM=="/bin/echo -n special-device", RESULT=="special--*", NAME="%c-2-%n"
+SUBSYSTEMS=="scsi", PROGRAM=="/bin/echo -n special-device", RESULT=="special-device-", NAME="%c-3-%n"
+SUBSYSTEMS=="scsi", PROGRAM=="/bin/echo -n special-device", RESULT=="special-devic", NAME="%c-4-%n"
+SUBSYSTEMS=="scsi", PROGRAM=="/bin/echo -n special-device", RESULT=="special-*", NAME="%c-%n"
 EOF
        },
        {
@@ -295,8 +332,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
+SUBSYSTEMS=="scsi", PROGRAM=="/bin/echo test", RESULT=="test", NAME="newline_removed"
 EOF
        },
        {
@@ -304,8 +341,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
+SUBSYSTEMS=="scsi", PROGRAM=="/bin/echo -n test-%b", RESULT=="test-0:0*", NAME="%c"
 EOF
        },
        {
@@ -313,8 +350,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
+SUBSYSTEMS=="scsi", PROGRAM=="/bin/echo -n escape-%%n", KERNEL=="sda3", NAME="%c"
 EOF
        },
        {
@@ -322,8 +359,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
+SUBSYSTEMS=="scsi", PROGRAM=="/bin/echo -n foo3 foo4 foo5 foo6 foo7 foo8 foo9", KERNEL=="sda3", NAME="%c{7}"
 EOF
        },
        {
@@ -331,8 +368,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
+SUBSYSTEMS=="scsi", PROGRAM=="/bin/sh -c 'echo foo3 foo4 foo5 foo6 foo7 foo8 foo9 | sed  s/foo9/bar9/'", KERNEL=="sda3", NAME="%c{7}"
 EOF
        },
        {
@@ -340,8 +377,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
+SUBSYSTEMS=="scsi", PROGRAM=="/bin/echo -n 'foo3 foo4'   'foo5   foo6   foo7 foo8'", KERNEL=="sda3", NAME="%c{5}"
 EOF
        },
        {
@@ -349,8 +386,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
+SUBSYSTEMS=="scsi", PROGRAM=="/bin/echo -n foo3 foo4 foo5 foo6 foo7 foo8 foo9", KERNEL=="sda3", NAME="my-%c{7}"
 EOF
        },
        {
@@ -358,48 +395,83 @@ 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
+SUBSYSTEMS=="scsi", PROGRAM=="/bin/echo -n foo3 foo4 foo5 foo6 foo7 foo8 foo9", KERNEL=="sda3", NAME="my-%c{6}"
 EOF
        },
        {
-               desc            => "invalid program for device with no bus",
-               subsys          => "tty",
-               devpath         => "/class/tty/console",
-               exp_name        => "TTY" ,
-               conf            => <<EOF
-BUS="scsi", PROGRAM="/bin/echo -n foo", RESULT="foo", NAME="foo"
-KERNEL="console", NAME="TTY"
+               desc            => "test substitution by variable name",
+               subsys          => "block",
+               devpath         => "/block/sda/sda3",
+               exp_name        => "Major:8-minor:3-kernelnumber:3-id:0:0:0:0",
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", KERNELS=="0:0:0:0", NAME="Major:\$major-minor:\$minor-kernelnumber:\$number-id:\$id"
 EOF
        },
        {
-               desc            => "valid program for device with no bus",
+               desc            => "test substitution by variable name 2",
+               subsys          => "block",
+               devpath         => "/block/sda/sda3",
+               exp_name        => "Major:8-minor:3-kernelnumber:3-id:0:0:0:0",
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", KERNELS=="0:0:0:0", DEVPATH=="*/sda/*", NAME="Major:\$major-minor:%m-kernelnumber:\$number-id:\$id"
+EOF
+       },
+       {
+               desc            => "test substitution by variable name 3",
+               subsys          => "block",
+               devpath         => "/block/sda/sda3",
+               exp_name        => "830:0:0:03" ,
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", KERNELS=="0:0:0:0", DEVPATH=="*/sda/*", NAME="%M%m%b%n"
+EOF
+       },
+       {
+               desc            => "test substitution by variable name 4",
+               subsys          => "block",
+               devpath         => "/block/sda/sda3",
+               exp_name        => "833" ,
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", KERNELS=="0:0:0:0", DEVPATH=="*/sda/*", NAME="\$major\$minor\$number"
+EOF
+       },
+       {
+               desc            => "test substitution by variable name 5",
+               subsys          => "block",
+               devpath         => "/block/sda/sda3",
+               exp_name        => "8330:0:0:0" ,
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", KERNELS=="0:0:0:0", DEVPATH=="*/sda/*", NAME="\$major%m%n\$id"
+EOF
+       },
+       {
+               desc            => "non matching SUBSYSTEMS for device with no parent",
                subsys          => "tty",
                devpath         => "/class/tty/console",
-               exp_name        => "foo" ,
-               conf            => <<EOF
-PROGRAM="/bin/echo -n foo", RESULT="foo", NAME="foo"
-KERNEL="console", NAME="TTY"
+               exp_name        => "TTY",
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", PROGRAM=="/bin/echo -n foo", RESULT=="foo", NAME="foo"
+KERNEL=="console", NAME="TTY"
 EOF
        },
        {
-               desc            => "invalid label for device with no bus",
+               desc            => "non matching SUBSYSTEMS",
                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
+SUBSYSTEMS=="foo", ATTRS{dev}=="5:1", NAME="foo"
+KERNEL=="console", NAME="TTY"
 EOF
        },
        {
-               desc            => "valid label for device with no bus",
+               desc            => "ATTRS match",
                subsys          => "tty",
                devpath         => "/class/tty/console",
                exp_name        => "foo" ,
-               conf            => <<EOF
-SYSFS{dev}="5:1", NAME="foo"
-KERNEL="console", NAME="TTY"
+               rules           => <<EOF
+ATTRS{dev}=="5:1", NAME="foo"
+KERNEL=="console", NAME="TTY"
 EOF
        },
        {
@@ -407,10 +479,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
+SUBSYSTEMS=="usb", PROGRAM=="/bin/echo -n usb-%b", NAME="%c"
+SUBSYSTEMS=="scsi", PROGRAM=="/bin/echo -n scsi-%b", NAME="%c"
+SUBSYSTEMS=="foo", PROGRAM=="/bin/echo -n foo-%b", NAME="%c"
 EOF
        },
        {
@@ -418,8 +490,9 @@ EOF
                subsys          => "block",
                devpath         => "/block/sda",
                exp_name        => "boot_disk15" ,
-               conf            => <<EOF
-BUS="scsi", SYSFS{vendor}="IBM-ESXS", NAME{all_partitions}="boot_disk"
+               exp_majorminor  => "8:15",
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", ATTRS{vendor}=="IBM-ESXS", NAME{all_partitions}="boot_disk"
 EOF
        },
        {
@@ -427,8 +500,8 @@ EOF
                subsys          => "tty",
                devpath         => "/class/tty/ttyUSB0",
                exp_name        => "visor" ,
-               conf            => <<EOF
-SYSFS{idProduct}="2008", NAME="visor"
+               rules           => <<EOF
+ATTRS{idProduct}=="2008", NAME="visor"
 EOF
        },
        {
@@ -436,9 +509,9 @@ EOF
                subsys          => "block",
                devpath         => "/block/rd!c0d0",
                exp_name        => "rd/c0d0" ,
-               conf            => <<EOF
-BUS="scsi", NAME="%k"
-KERNEL="ttyUSB0", NAME="visor"
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", NAME="%k"
+KERNEL=="ttyUSB0", NAME="visor"
 EOF
        },
        {
@@ -446,8 +519,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
        },
        {
@@ -455,74 +528,92 @@ 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
+SUBSYSTEMS=="scsi", NAME="%k"
+KERNEL=="ttyUSB0", NAME="visor"
 EOF
        },
        {
-               desc            => "ID rule",
+               desc            => "KERNELS rule",
                subsys          => "block",
                devpath         => "/block/sda",
                exp_name        => "scsi-0:0:0:0",
-               conf            => <<EOF
-BUS="usb", ID="0:0:0:0", NAME="not-scsi"
-BUS="scsi", ID="0:0:0:1", NAME="no-match"
-BUS="scsi", ID=":0", NAME="short-id"
-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
+SUBSYSTEMS=="usb", KERNELS=="0:0:0:0", NAME="not-scsi"
+SUBSYSTEMS=="scsi", KERNELS=="0:0:0:1", NAME="no-match"
+SUBSYSTEMS=="scsi", KERNELS==":0", NAME="short-id"
+SUBSYSTEMS=="scsi", KERNELS=="/0:0:0:0", NAME="no-match"
+SUBSYSTEMS=="scsi", KERNELS=="0:0:0:0", NAME="scsi-0:0:0:0"
 EOF
        },
        {
-               desc            => "ID wildcard all",
+               desc            => "KERNELS wildcard all",
                subsys          => "block",
                devpath         => "/block/sda",
                exp_name        => "scsi-0:0:0:0",
-               conf            => <<EOF
-BUS="scsi", ID="*:1", NAME="no-match"
-BUS="scsi", ID="*:0:1", NAME="no-match"
-BUS="scsi", ID="*:0:0:1", NAME="no-match"
-BUS="scsi", ID="*", NAME="scsi-0:0:0:0"
-BUS="scsi", ID="0:0:0:0", NAME="bad"
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", KERNELS=="*:1", NAME="no-match"
+SUBSYSTEMS=="scsi", KERNELS=="*:0:1", NAME="no-match"
+SUBSYSTEMS=="scsi", KERNELS=="*:0:0:1", NAME="no-match"
+SUBSYSTEMS=="scsi", KERNELS=="*", NAME="scsi-0:0:0:0"
+SUBSYSTEMS=="scsi", KERNELS=="0:0:0:0", NAME="bad"
 EOF
        },
        {
-               desc            => "ID wildcard partial",
+               desc            => "KERNELS wildcard partial",
                subsys          => "block",
                devpath         => "/block/sda",
                exp_name        => "scsi-0:0:0:0",
-               conf            => <<EOF
-BUS="scsi", ID="*:0", NAME="scsi-0:0:0:0"
-BUS="scsi", ID="0:0:0:0", NAME="bad"
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", KERNELS=="*:0", NAME="scsi-0:0:0:0"
+SUBSYSTEMS=="scsi", KERNELS=="0:0:0:0", NAME="bad"
 EOF
        },
        {
-               desc            => "ID wildcard partial 2",
+               desc            => "KERNELS wildcard partial 2",
                subsys          => "block",
                devpath         => "/block/sda",
                exp_name        => "scsi-0:0:0:0",
-               conf            => <<EOF
-BUS="scsi", ID="*:0:0:0", NAME="scsi-0:0:0:0"
-BUS="scsi", ID="0:0:0:0", NAME="bad"
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", KERNELS=="*:0:0:0", NAME="scsi-0:0:0:0"
+SUBSYSTEMS=="scsi", KERNELS=="0:0:0:0", NAME="bad"
+EOF
+       },
+       {
+               desc            => "substitute attr with link target value (first match)",
+               subsys          => "block",
+               devpath         => "/block/sda",
+               exp_name        => "driver-is-sd",
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", NAME="driver-is-\$attr{driver}"
 EOF
        },
        {
-               desc            => "ignore SYSFS attribute whitespace",
+               desc            => "substitute attr with link target value (currently selected device)",
+               subsys          => "block",
+               devpath         => "/block/sda",
+               exp_name        => "driver-is-aic7xxx",
+               rules           => <<EOF
+SUBSYSTEMS=="pci", NAME="driver-is-\$attr{driver}"
+EOF
+       },
+       {
+               desc            => "ignore ATTRS attribute whitespace",
                subsys          => "block",
                devpath         => "/block/sda",
                exp_name        => "ignored",
-               conf            => <<EOF
-BUS="scsi", SYSFS{whitespace_test}="WHITE  SPACE", NAME="ignored"
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", ATTRS{whitespace_test}=="WHITE  SPACE", NAME="ignored"
 EOF
        },
        {
-               desc            => "do not ignore SYSFS attribute whitespace",
+               desc            => "do not ignore ATTRS attribute whitespace",
                subsys          => "block",
                devpath         => "/block/sda",
                exp_name        => "matched-with-space",
-               conf            => <<EOF
-BUS="scsi", SYSFS{whitespace_test}="WHITE  SPACE ", NAME="wrong-to-ignore"
-BUS="scsi", SYSFS{whitespace_test}="WHITE  SPACE   ", NAME="matched-with-space"
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", ATTRS{whitespace_test}=="WHITE  SPACE ", NAME="wrong-to-ignore"
+SUBSYSTEMS=="scsi", ATTRS{whitespace_test}=="WHITE  SPACE   ", NAME="matched-with-space"
 EOF
        },
        {
@@ -531,8 +622,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
        },
        {
@@ -541,8 +632,8 @@ EOF
                devpath         => "/block/sda",
                exp_name        => "node",
                exp_perms       => "5000::0660",
-               conf            => <<EOF
-BUS="scsi", KERNEL="sda", NAME="node", OWNER="5000"
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="node", OWNER="5000"
 EOF
        },
        {
@@ -551,8 +642,38 @@ EOF
                devpath         => "/block/sda",
                exp_name        => "node",
                exp_perms       => ":100:0660",
-               conf            => <<EOF
-BUS="scsi", KERNEL="sda", NAME="node", GROUP="100"
+               rules           => <<EOF
+SUBSYSTEMS=="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
+SUBSYSTEMS=="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
+SUBSYSTEMS=="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
+SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="node", OWNER="root", GROUP="mail"
 EOF
        },
        {
@@ -561,8 +682,8 @@ EOF
                devpath         => "/block/sda",
                exp_name        => "node",
                exp_perms       => "::0777",
-               conf            => <<EOF
-BUS="scsi", KERNEL="sda", NAME="node", MODE="0777"
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="node", MODE="0777"
 EOF
        },
        {
@@ -571,8 +692,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
+SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="node", OWNER="5000", GROUP="100", MODE="0777"
 EOF
        },
        {
@@ -581,8 +702,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
        },
        {
@@ -591,8 +712,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
        },
        {
@@ -601,8 +722,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
        },
        {
@@ -611,8 +732,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
        },
        {
@@ -621,10 +742,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
        },
        {
@@ -633,12 +754,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
        },
        {
@@ -647,12 +768,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
        },
        {
@@ -661,8 +782,8 @@ EOF
                devpath         => "/block/sda",
                exp_name        => "node",
                exp_majorminor  => "8:0",
-               conf            => <<EOF
-BUS="scsi", KERNEL="sda", NAME="node"
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="node"
 EOF
        },
        {
@@ -671,8 +792,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
        },
        {
@@ -681,8 +802,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
        },
        {
@@ -691,8 +812,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
        },
        {
@@ -701,8 +822,19 @@ 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
+       },
+       {
+               desc            => "multiple symlinks with a lot of s p a c e s",
+               subsys          => "tty",
+               devpath         => "/class/tty/ttyUSB0",
+               exp_name        => "one",
+               not_exp_name    => " ",
+               exp_target      => "ttyUSB0",
+               rules           => <<EOF
+KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="  one     two        "
 EOF
        },
        {
@@ -711,8 +843,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
        },
        {
@@ -721,8 +853,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
+SUBSYSTEMS=="scsi", ATTRS{vendor}=="IBM-ESXS", NAME="1/2/a/b/node", SYMLINK="1/2/symlink"
 EOF
        },
        {
@@ -731,8 +863,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
+SUBSYSTEMS=="scsi", ATTRS{vendor}=="IBM-ESXS", NAME="1/2/a/b/node", SYMLINK="1/2/c/d/symlink"
 EOF
        },
        {
@@ -741,8 +873,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
        },
        {
@@ -751,10 +883,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"
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", KERNEL=="sda", SYMLINK+="symlink-only1"
+SUBSYSTEMS=="scsi", KERNEL=="sda", SYMLINK+="symlink-only2"
+SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="link", SYMLINK+="symlink0"
 EOF
        },
        {
@@ -765,31 +897,8 @@ EOF
                exp_target      => "link",
                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_add_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_add_error   => "yes",
-               exp_rem_error   => "yes",
-               conf            => <<EOF
-BUS="scsi", KERNEL="sda", NAME="", SYMLINK=""
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="link", SYMLINK+="."
 EOF
        },
        {
@@ -798,10 +907,11 @@ EOF
                devpath         => "/class/tty/tty0",
                exp_name        => "link",
                exp_target      => "link",
+               exp_add_error   => "yes",
                exp_rem_error   => "yes",
-               option          => "clear",
-               conf            => <<EOF
-KERNEL="tty0", NAME="link", SYMLINK="link"
+               option          => "clean",
+               rules           => <<EOF
+KERNEL=="tty0", NAME="link", SYMLINK+="link"
 EOF
        },
        {
@@ -810,8 +920,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
        },
        {
@@ -820,8 +930,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
        },
        {
@@ -830,8 +940,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
        },
        {
@@ -840,8 +950,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
+SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="node", SYMLINK+="symlink-%b"
 EOF
        },
        {
@@ -850,8 +960,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
        },
        {
@@ -860,8 +970,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
        },
        {
@@ -870,8 +980,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
        },
        {
@@ -880,9 +990,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
+SUBSYSTEMS=="scsi", KERNEL=="sda", PROGRAM=="/bin/echo link test this" SYMLINK+="%c{2+}"
+SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="link", SYMLINK+="symlink0"
 EOF
        },
        {
@@ -891,8 +1001,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
        },
        {
@@ -901,28 +1011,8 @@ EOF
                devpath         => "/class/tty/ttyUSB0",
                exp_name        => "188",
                exp_target      => "ttyUSB0",
-               conf            => <<EOF
-KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="%3s{dev}"
-EOF
-       },
-       {
-               desc            => "symlink with '%' in name",
-               subsys          => "tty",
-               devpath         => "/class/tty/ttyUSB0",
-               exp_name        => "percent%sign",
-               exp_target      => "ttyUSB0",
-               conf            => <<EOF
-KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="percent%%sign"
-EOF
-       },
-       {
-               desc            => "symlink with '%' in name",
-               subsys          => "tty",
-               devpath         => "/class/tty/ttyUSB0",
-               exp_name        => "%ttyUSB0_name",
-               exp_target      => "ttyUSB0",
-               conf            => <<EOF
-KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="%%%k_name"
+               rules           => <<EOF
+KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK+="%3s{dev}"
 EOF
        },
        {
@@ -931,8 +1021,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
+SUBSYSTEMS=="scsi", PROGRAM=="/bin/echo -n node link1 link2", RESULT=="node *", NAME="%c{1}", SYMLINK+="%c{2} %c{3}"
 EOF
        },
        {
@@ -941,256 +1031,683 @@ 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
+SUBSYSTEMS=="scsi", PROGRAM=="/bin/echo -n node link1 link2 link3 link4", RESULT=="node *", NAME="%c{1}", SYMLINK+="%c{2+}"
 EOF
        },
        {
-               desc            => "enumeration char test (single test)",
+               desc            => "ignore rule test",
                subsys          => "block",
                devpath         => "/block/sda",
-               exp_name        => "cdrom",
-               conf            => <<EOF
-KERNEL="sda", NAME="cdrom%e"
+               exp_name        => "nothing",
+               not_exp_name    => "node",
+               exp_add_error   => "yes",
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="node", OPTIONS="ignore"
 EOF
        },
        {
-               desc            => "enumeration char test sequence 1/5 (keep)",
+               desc            => "all_partitions, option-only rule",
                subsys          => "block",
                devpath         => "/block/sda",
-               exp_name        => "cdrom",
-               option          => "keep",
-               conf            => <<EOF
-KERNEL="sda", NAME="cdrom%e"
+               exp_name        => "node6",
+               rules           => <<EOF
+SUBSYSTEM=="block", OPTIONS="all_partitions"
+SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="node"
 EOF
        },
        {
-               desc            => "enumeration char test sequence 2/5 (keep)",
+               desc            => "all_partitions, option-only rule (fail on partition)",
                subsys          => "block",
                devpath         => "/block/sda/sda1",
-               exp_name        => "enum",
-               option          => "keep",
-               conf            => <<EOF
-KERNEL="sda1", NAME="enum%e"
+               exp_name        => "node6",
+               exp_add_error   => "yes",
+               rules           => <<EOF
+SUBSYSTEM=="block", OPTIONS="all_partitions"
+SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="node"
 EOF
        },
        {
-               desc            => "enumeration char test sequence 3/5 (keep)",
+               desc            => "ignore remove event test",
                subsys          => "block",
-               devpath         => "/block/sda/sda2",
-               exp_name        => "cdrom1",
-               option          => "keep",
-               conf            => <<EOF
-KERNEL="sda2", NAME="cdrom%e"
+               devpath         => "/block/sda",
+               exp_name        => "node",
+               exp_rem_error   => "yes",
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="node", OPTIONS="ignore_remove"
 EOF
        },
        {
-               desc            => "enumeration char test sequence 4/5 (keep)",
+               desc            => "ignore remove event test (with all partitions)",
                subsys          => "block",
-               devpath         => "/block/sda/sda3",
-               exp_name        => "enum1",
-               option          => "keep",
-               conf            => <<EOF
-KERNEL="sda3", NAME="enum%e"
+               devpath         => "/block/sda",
+               exp_name        => "node14",
+               exp_rem_error   => "yes",
+               option          => "clean",
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="node", OPTIONS="ignore_remove, all_partitions"
 EOF
        },
        {
-               desc            => "enumeration char test sequence 5/5 (clean)",
+               desc            => "SUBSYSTEM match test",
                subsys          => "block",
-               devpath         => "/block/sda/sda4",
-               exp_name        => "cdrom2",
-               option          => "clear",
-               conf            => <<EOF
-KERNEL="sda4", NAME="cdrom%e"
+               devpath         => "/block/sda",
+               exp_name        => "node",
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="should_not_match", SUBSYSTEM=="vc"
+SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="node", SUBSYSTEM=="block"
+SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="should_not_match2", SUBSYSTEM=="vc"
 EOF
        },
        {
-               desc            => "enumeration char test after cleanup (single test)",
+               desc            => "DRIVERS match test",
                subsys          => "block",
                devpath         => "/block/sda",
-               exp_name        => "cdrom",
-               conf            => <<EOF
-KERNEL="sda", NAME="cdrom%e"
+               exp_name        => "node",
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="should_not_match", DRIVERS=="sd-wrong"
+SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="node", DRIVERS=="sd"
 EOF
        },
        {
-               desc            => "ignore rule test",
+               desc            => "temporary node creation test",
                subsys          => "block",
                devpath         => "/block/sda",
                exp_name        => "node",
-               exp_add_error   => "yes",
-               conf            => <<EOF
-BUS="scsi", KERNEL="sda", NAME="node", OPTIONS="ignore"
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", KERNEL=="sda", PROGRAM=="/usr/bin/test -b %N" NAME="node"
 EOF
        },
        {
-               desc            => "all_partitions, option-only rule",
+               desc            => "devpath substitution test",
                subsys          => "block",
                devpath         => "/block/sda",
-               exp_name        => "node6",
-               conf            => <<EOF
-SUBSYSTEM="block", OPTIONS="all_partitions"
-BUS="scsi", KERNEL="sda", NAME="node"
+               exp_name        => "sda",
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", KERNEL=="sda", PROGRAM=="/bin/echo %p", RESULT=="/block/sda" NAME="%k"
 EOF
        },
        {
-               desc            => "all_partitions, option-only rule (fail on partition)",
+               desc            => "parent node name substitution test sequence 1/2 (keep)",
+               subsys          => "block",
+               devpath         => "/block/sda",
+               exp_name        => "main_device",
+               option          => "keep",
+               rules           => <<EOF
+SUBSYSTEMS=="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        => "node6",
-               exp_add_error   => "yes",
-               conf            => <<EOF
-SUBSYSTEM="block", OPTIONS="all_partitions"
-BUS="scsi", KERNEL="sda", NAME="node"
+               exp_name        => "main_device-part-1",
+               option          => "clean",
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", KERNEL=="sda1", NAME="%P-part-1"
 EOF
        },
        {
-               desc            => "ignore remove event test",
+               desc            => "udev_root substitution",
+               subsys          => "block",
+               devpath         => "/block/sda/sda1",
+               exp_name        => "start-udev-root-end",
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", KERNEL=="sda1", NAME="start-%r-end"
+EOF
+       },
+       {
+               desc            => "last_rule option",
+               subsys          => "block",
+               devpath         => "/block/sda/sda1",
+               exp_name        => "last",
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", KERNEL=="sda1", SYMLINK+="last", OPTIONS="last_rule"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", NAME="very-last"
+EOF
+       },
+       {
+               desc            => "negation KERNEL!=",
+               subsys          => "block",
+               devpath         => "/block/sda/sda1",
+               exp_name        => "match",
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", KERNEL!="sda1", NAME="matches-but-is-negated"
+SUBSYSTEMS=="scsi", KERNEL!="xsda1", NAME="match"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", NAME="wrong"
+EOF
+       },
+       {
+               desc            => "negation SUBSYSTEM!=",
+               subsys          => "block",
+               devpath         => "/block/sda/sda1",
+               exp_name        => "not-anything",
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", SUBSYSTEM=="block", KERNEL!="sda1", NAME="matches-but-is-negated"
+SUBSYSTEMS=="scsi", SUBSYSTEM!="anything", NAME="not-anything"
+SUBSYSTEMS=="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"
+SUBSYSTEMS=="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"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", NAME="wrong"
+EOF
+       },
+       {
+               desc            => "ENV{} test",
+               subsys          => "block",
+               devpath         => "/block/sda/sda1",
+               exp_name        => "true",
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ENV_KEY_TEST}=="go", NAME="wrong"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ENV_KEY_TEST}=="test", NAME="true"
+SUBSYSTEMS=="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
+SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ENV_KEY_TEST}=="go", NAME="wrong"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ENV_KEY_TEST}=="yes", ENV{ACTION}=="add", ENV{DEVPATH}=="/block/sda/sdax1", NAME="no"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ENV_KEY_TEST}=="test", ENV{ACTION}=="add", ENV{DEVPATH}=="/block/sda/sda1", NAME="true"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ENV_KEY_TEST}=="bad", NAME="bad"
+EOF
+       },
+       {
+               desc            => "ENV{} test (assign)",
+               subsys          => "block",
+               devpath         => "/block/sda/sda1",
+               exp_name        => "true",
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ASSIGN}="true"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ASSIGN}=="yes", NAME="no"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ASSIGN}=="true", NAME="true"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", NAME="bad"
+EOF
+       },
+       {
+               desc            => "ENV{} test (assign 2 times)",
+               subsys          => "block",
+               devpath         => "/block/sda/sda1",
+               exp_name        => "true",
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ASSIGN}="true"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ASSIGN}="absolutely-\$env{ASSIGN}"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ASSIGN}=="yes", NAME="no"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ASSIGN}=="absolutely-true", NAME="true"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", NAME="bad"
+EOF
+       },
+       {
+               desc            => "ENV{} test (assign2)",
+               subsys          => "block",
+               devpath         => "/block/sda/sda1",
+               exp_name        => "part",
+               rules           => <<EOF
+SUBSYSTEM=="block", KERNEL=="*[0-9]", ENV{PARTITION}="true", ENV{MAINDEVICE}="false"
+SUBSYSTEM=="block", KERNEL=="*[!0-9]", ENV{PARTITION}="false", ENV{MAINDEVICE}="true"
+ENV{MAINDEVICE}=="true", NAME="disk"
+ENV{PARTITION}=="true", NAME="part"
+NAME="bad"
+EOF
+       },
+       {
+               desc            => "untrusted string sanitize",
+               subsys          => "block",
+               devpath         => "/block/sda/sda1",
+               exp_name        => "sane",
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", KERNEL=="sda1", PROGRAM=="/bin/echo -e name; (/sbin/badprogram)", RESULT=="name_ _/sbin/badprogram_", NAME="sane"
+EOF
+       },
+       {
+               desc            => "untrusted string sanitize (don't replace utf8)",
+               subsys          => "block",
+               devpath         => "/block/sda/sda1",
+               exp_name        => "uber",
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", KERNEL=="sda1", PROGRAM=="/bin/echo -e \\xc3\\xbcber" RESULT=="\xc3\xbcber", NAME="uber"
+EOF
+       },
+       {
+               desc            => "untrusted string sanitize (replace invalid utf8)",
+               subsys          => "block",
+               devpath         => "/block/sda/sda1",
+               exp_name        => "replaced",
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", KERNEL=="sda1", PROGRAM=="/bin/echo -e \\xef\\xe8garbage", RESULT=="__garbage", NAME="replaced"
+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        => "node",
+               exp_name        => "ok",
+               rules           => <<EOF
+KERNEL=="sda", ATTRS{nothing}!="", NAME="not-1-ok"
+KERNEL=="sda", ATTRS{nothing}=="", NAME="not-2-ok"
+KERNEL=="sda", ATTRS{vendor}!="", NAME="ok"
+KERNEL=="sda", ATTRS{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",
-               conf            => <<EOF
-BUS="scsi", KERNEL="sda", NAME="node", OPTIONS="ignore_remove"
+               option          => "clean",
+               rules           => <<EOF
+KERNEL=="sda", NAME="ok", RUN+="/bin/ln -s ok %r/testsymlink"
+KERNEL=="sda", NAME="not-ok"
 EOF
        },
        {
-               desc            => "ignore remove event test (with all partitions)",
+               desc            => "test RUN key and DEVNAME",
                subsys          => "block",
                devpath         => "/block/sda",
-               exp_name        => "node14",
+               exp_name        => "testsymlink",
+               exp_target      => "ok",
                exp_rem_error   => "yes",
-               option          => "clear",
-               conf            => <<EOF
-BUS="scsi", KERNEL="sda", NAME="node", OPTIONS="ignore_remove, all_partitions"
+               option          => "clean",
+               rules           => <<EOF
+KERNEL=="sda", NAME="ok", RUN+="/bin/sh -c 'ln -s `basename \$\$DEVNAME` %r/testsymlink'"
+KERNEL=="sda", NAME="not-ok"
 EOF
        },
        {
-               desc            => "SUBSYSTEM match test",
+               desc            => "test RUN key remove",
                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"
+               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
        },
        {
-               desc            => "DRIVER match test",
+               desc            => "final assignment",
                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"
+               exp_name        => "ok",
+               exp_perms       => "root:nobody:0640",
+               rules           => <<EOF
+KERNEL=="sda", GROUP:="nobody"
+KERNEL=="sda", GROUP="not-ok", MODE="0640", NAME="ok"
 EOF
        },
        {
-               desc            => "temporary node creation test",
+               desc            => "final assignment",
                subsys          => "block",
                devpath         => "/block/sda",
-               exp_name        => "node",
-               conf            => <<EOF
-BUS="scsi", KERNEL="sda", PROGRAM="/usr/bin/test -b %N" NAME="node"
+               exp_name        => "ok",
+               exp_perms       => "root:nobody:0640",
+               rules           => <<EOF
+KERNEL=="sda", GROUP:="nobody"
+SUBSYSTEM=="block", MODE:="640"
+KERNEL=="sda", GROUP="not-ok", MODE="0666", NAME="ok"
 EOF
        },
        {
-               desc            => "devpath substitution test",
+               desc            => "env substitution",
                subsys          => "block",
                devpath         => "/block/sda",
-               exp_name        => "sda",
-               conf            => <<EOF
-BUS="scsi", KERNEL="sda", PROGRAM="/bin/echo %p", RESULT="/block/sda" NAME="%k"
+               exp_name        => "node-add-me",
+               rules           => <<EOF
+KERNEL=="sda", MODE="0666", NAME="node-\$env{ACTION}-me"
 EOF
        },
        {
-               desc            => "parent node name substitution test sequence 1/2 (keep)",
+               desc            => "reset list to current value",
+               subsys          => "tty",
+               devpath         => "/class/tty/ttyUSB0",
+               exp_name        => "three",
+               not_exp_name    => "two",
+               exp_target      => "node",
+               rules           => <<EOF
+KERNEL=="ttyUSB[0-9]*", SYMLINK+="one"
+KERNEL=="ttyUSB[0-9]*", SYMLINK+="two"
+KERNEL=="ttyUSB[0-9]*", SYMLINK="three"
+KERNEL=="ttyUSB[0-9]*", NAME="node"
+EOF
+       },
+       {
+               desc            => "test empty NAME",
+               subsys          => "tty",
+               devpath         => "/class/tty/ttyUSB0",
+               exp_name        => "node",
+               not_exp_name    => "wrong",
+               exp_add_error   => "yes",
+               rules           => <<EOF
+KERNEL=="ttyUSB[0-9]*", NAME=""
+KERNEL=="ttyUSB[0-9]*", NAME="wrong"
+EOF
+       },
+       {
+               desc            => "test empty NAME 2",
+               subsys          => "tty",
+               devpath         => "/class/tty/ttyUSB0",
+               exp_name        => "right",
+               rules           => <<EOF
+KERNEL=="ttyUSB[0-9]*", NAME="right"
+KERNEL=="ttyUSB[0-9]*", NAME=""
+KERNEL=="ttyUSB[0-9]*", NAME="wrong"
+EOF
+       },
+       {
+               desc            => "test multi matches",
+               subsys          => "tty",
+               devpath         => "/class/tty/ttyUSB0",
+               exp_name        => "right",
+               rules           => <<EOF
+KERNEL=="ttyUSB*|nothing", NAME="right"
+KERNEL=="ttyUSB*", NAME="wrong"
+EOF
+       },
+       {
+               desc            => "test multi matches 2",
+               subsys          => "tty",
+               devpath         => "/class/tty/ttyUSB0",
+               exp_name        => "right",
+               rules           => <<EOF
+KERNEL=="dontknow*|*nothing", NAME="nomatch"
+KERNEL=="dontknow*|ttyUSB*|nothing*", NAME="right"
+KERNEL=="ttyUSB*", NAME="wrong"
+EOF
+       },
+       {
+               desc            => "IMPORT parent test sequence 1/2 (keep)",
                subsys          => "block",
                devpath         => "/block/sda",
-               exp_name        => "main_device",
+               exp_name        => "parent",
                option          => "keep",
-               conf            => <<EOF
-BUS="scsi", KERNEL="sda", NAME="main_device"
+               rules           => <<EOF
+KERNEL=="sda", IMPORT="/bin/echo -e \'PARENT_KEY=parent_right\\nWRONG_PARENT_KEY=parent_wrong'"
+KERNEL=="sda", NAME="parent"
 EOF
        },
        {
-               desc            => "parent node name substitution test sequence 2/2 (clean)",
+               desc            => "IMPORT parent test sequence 2/2 (keep)",
                subsys          => "block",
                devpath         => "/block/sda/sda1",
-               exp_name        => "main_device-part-1",
+               exp_name        => "parentenv-parent_right",
                option          => "clean",
-               conf            => <<EOF
-BUS="scsi", KERNEL="sda1", NAME="%P-part-1"
+               rules           => <<EOF
+KERNEL=="sda1", IMPORT{parent}="PARENT*", NAME="parentenv-\$env{PARENT_KEY}\$env{WRONG_PARENT_KEY}"
 EOF
        },
        {
-               desc            => "udev_root substitution",
+               desc            => "GOTO test",
                subsys          => "block",
                devpath         => "/block/sda/sda1",
-               exp_name        => "start-udev-root-end",
-               option          => "clean",
-               conf            => <<EOF
-BUS="scsi", KERNEL="sda1", NAME="start-%r-end"
+               exp_name        => "right",
+               rules           => <<EOF
+KERNEL=="sda1", GOTO="TEST"
+KERNEL=="sda1", NAME="wrong"
+KERNEL=="sda1", NAME="", LABEL="NO"
+KERNEL=="sda1", NAME="right", LABEL="TEST"
+KERNEL=="sda1", NAME="wrong2"
+EOF
+       },
+       {
+               desc            => "NAME compare test",
+               subsys          => "block",
+               devpath         => "/block/sda/sda1",
+               exp_name        => "link",
+               exp_target      => "node",
+               not_exp_name    => "wronglink",
+               rules           => <<EOF
+KERNEL=="sda1", NAME="node"
+KERNEL=="sda2", NAME="wrong"
+KERNEL=="sda1", NAME=="wrong*", SYMLINK+="wronglink"
+KERNEL=="sda1", NAME=="?*", SYMLINK+="link"
+KERNEL=="sda1", NAME=="node*", SYMLINK+="link2"
+EOF
+       },
+       {
+               desc            => "NAME compare test 2",
+               subsys          => "block",
+               devpath         => "/block/sda/sda1",
+               exp_name        => "link2",
+               exp_target      => "sda1",
+               not_exp_name    => "link",
+               rules           => <<EOF
+KERNEL=="sda1", NAME=="?*", SYMLINK+="link"
+KERNEL=="sda1", NAME!="?*", SYMLINK+="link2"
+EOF
+       },
+       {
+               desc            => "invalid key operation",
+               subsys          => "block",
+               devpath         => "/block/sda/sda1",
+               exp_name        => "yes",
+               rules           => <<EOF
+KERNEL="sda1", NAME="no"
+KERNEL=="sda1", NAME="yes"
+EOF
+       },
+       {
+               desc            => "operator chars in attribute",
+               subsys          => "block",
+               devpath         => "/block/sda",
+               exp_name        => "yes",
+               rules           => <<EOF
+KERNEL=="sda", ATTR{test:colon+plus}=="?*", NAME="yes"
+EOF
+       },
+       {
+               desc            => "overlong comment line",
+               subsys          => "block",
+               devpath         => "/block/sda/sda1",
+               exp_name        => "yes",
+               rules           => <<EOF
+# 012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
+   # 012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
+KERNEL="sda1", NAME=="no"
+KERNEL=="sda1", NAME="yes"
+EOF
+       },
+       {
+               desc            => "magic subsys/kernel lookup",
+               subsys          => "block",
+               devpath         => "/block/sda",
+               exp_name        => "00:e0:00:fb:04:e1",
+               rules           => <<EOF
+KERNEL=="sda", NAME="\$attr{[net/eth0]address}"
+EOF
+       },
+       {
+               desc            => "TEST absolute path",
+               subsys          => "block",
+               devpath         => "/block/sda",
+               exp_name        => "there",
+               rules           => <<EOF
+TEST=="/etc/hosts", NAME="there"
+NAME="notthere"
+EOF
+       },
+       {
+               desc            => "TEST subsys/kernel lookup",
+               subsys          => "block",
+               devpath         => "/block/sda",
+               exp_name        => "yes",
+               rules           => <<EOF
+KERNEL=="sda", TEST=="[net/eth0]", NAME="yes"
+EOF
+       },
+       {
+               desc            => "TEST relative path",
+               subsys          => "block",
+               devpath         => "/block/sda",
+               exp_name        => "relative",
+               rules           => <<EOF
+KERNEL=="sda", TEST=="size", NAME="relative"
+EOF
+       },
+       {
+               desc            => "TEST wildcard substitution (find queue/nr_requests)",
+               subsys          => "block",
+               devpath         => "/block/sda",
+               exp_name        => "found-subdir",
+               rules           => <<EOF
+KERNEL=="sda", TEST=="*/nr_requests", NAME="found-subdir"
+EOF
+       },
+       {
+               desc            => "TEST MODE=0000",
+               subsys          => "block",
+               devpath         => "/block/sda",
+               exp_name        => "sda",
+               exp_perms       => "0:0:0000",
+               rules           => <<EOF
+KERNEL=="sda", MODE="0000"
+EOF
+       },
+       {
+               desc            => "TEST PROGRAM feeds MODE",
+               subsys          => "block",
+               devpath         => "/block/sda",
+               exp_name        => "sda",
+               exp_perms       => "0:0:0400",
+               rules           => <<EOF
+KERNEL=="sda", PROGRAM=="/bin/echo 0 0 0400", OWNER="%c{1}", GROUP="%c{2}", MODE="%c{3}"
+EOF
+       },
+       {
+               desc            => "TEST PROGRAM feeds MODE with overflow",
+               subsys          => "block",
+               devpath         => "/block/sda",
+               exp_name        => "sda",
+               exp_perms       => "0:0:0400",
+               rules           => <<EOF
+KERNEL=="sda", PROGRAM=="/bin/echo 0 0 0400letsdoabuffferoverflow0123456789012345789012345678901234567890", OWNER="%c{1}", GROUP="%c{2}", MODE="%c{3}"
 EOF
        },
+
 );
 
 # set env
-$ENV{UDEV_TEST} = "yes";
+$ENV{ENV_KEY_TEST} = "test";
 $ENV{SYSFS_PATH} = $sysfs;
-$ENV{UDEV_CONFIG_FILE} = $main_conf;
-$ENV{UDEV_NO_DEVD} = "yes";
-$ENV{UDEV_NO_HOTPLUGD} = "yes";
-
+$ENV{UDEV_CONFIG_FILE} = $udev_conf;
 
 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;
-       system("$udev_bin $subsys");
+       if ($valgrind > 0) {
+               system("$udev_bin_valgrind $subsys");
+       } else {
+               system("$udev_bin $subsys");
+       }
 }
 
 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; };
        }
@@ -1198,109 +1715,128 @@ 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_add_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_add_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 make_udev_root {
+       system("rm -rf $udev_root");
+       mkdir($udev_root) || die "unable to create udev_root: $udev_root\n";
+       # setting group and mode of udev_root ensures the tests work
+       # even if the parent directory has setgid bit enabled.
+       chown (0, 0, $udev_root) || die "unable to chown $udev_root\n";
+       chmod (0755, $udev_root) || die "unable to chmod $udev_root\n";
+}
+
 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->{not_exp_name})) {
+                       if ((-e "$PWD/$udev_root$rules->{not_exp_name}") ||
+                           (-l "$PWD/$udev_root$rules->{not_exp_name}")) {
+                               print "nonexistent: error \'$rules->{not_exp_name}\' not expected to be there\n";
+                               $error++
+                       }
+               }
+               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_add_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_rem_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") {
-               system("rm -rf $udev_db");
-               system("rm -rf $udev_root");
-               mkdir($udev_root) || die "unable to create udev_root: $udev_root\n";
+       print "\n";
+
+       if (defined($rules->{option}) && $rules->{option} eq "clean") {
+               make_udev_root ();
        }
 
 }
@@ -1313,34 +1849,42 @@ if (!($<==0)) {
 }
 
 # prepare
-system("rm -rf $udev_root");
-mkdir($udev_root) || die "unable to create udev_root: $udev_root\n";
+make_udev_root();
 
-# 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=\"$PWD\"\n";
+print CONF "udev_log=\"err\"\n";
 close CONF;
 
 my $test_num = 1;
+my @list;
 
-if ($ARGV[0]) {
-       # only run one test
-       $test_num = $ARGV[0];
-
-       if (defined($tests[$test_num-1]->{desc})) {
-               print "udev-test will run test number $test_num only:\n\n";
-               run_test($tests[$test_num-1], $test_num);
+foreach my $arg (@ARGV) {
+       if ($arg =~ m/--valgrind/) {
+               $valgrind = 1;
+               printf("using valgrind\n");
        } else {
-               print "test does not exist.\n";
+               push(@list, $arg);
+       }
+}
+
+if ($list[0]) {
+       foreach my $arg (@list) {
+               if (defined($tests[$arg-1]->{desc})) {
+                       print "udev-test will run test number $arg:\n\n";
+                       run_test($tests[$arg-1], $arg);
+               } else {
+                       print "test does not exist.\n";
+               }
        }
 } else {
        # 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++;
        }
 }
@@ -1348,8 +1892,7 @@ if ($ARGV[0]) {
 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);