chiark / gitweb /
allow setting of MODE="0000"
[elogind.git] / test / udev-test.pl
index 27fe35456e8f66c29ad86299d0644a249a5a7535..fee62a64060e155b6d5ba722514a2dbe66c8e01a 100755 (executable)
 # 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_bin   = "../test-udev";
 my $udev_root  = "udev-root/"; # !!! directory will be removed !!!
-my $udev_db    = ".udevdb";
 my $udev_conf  = "udev-test.conf";
 my $udev_rules = "udev-test.rules";
 
@@ -33,13 +32,33 @@ my $udev_rules      = "udev-test.rules";
 #my $udev_bin  = "valgrind --tool=memcheck --leak-check=yes   ../udev";
 
 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" ,
                rules           => <<EOF
-BUS=="scsi", SYSFS{vendor}=="IBM-ESXS", NAME="boot_disk%n"
+SUBSYSTEMS=="scsi", ATTRS{vendor}=="IBM-ESXS", NAME="boot_disk%n"
 KERNEL=="ttyUSB0", NAME="visor"
 EOF
        },
@@ -49,7 +68,7 @@ EOF
                devpath         => "/block/sda/sda1",
                exp_name        => "boot_disk1" ,
                rules           => <<EOF
-BUS=="scsi", SYSFS{vendor}=="IBM-ESXS", NAME="boot_disk%n"
+SUBSYSTEMS=="scsi", ATTRS{vendor}=="IBM-ESXS", NAME="boot_disk%n"
 EOF
        },
        {
@@ -58,10 +77,10 @@ EOF
                devpath         => "/block/sda/sda1",
                exp_name        => "boot_disk1" ,
                rules           => <<EOF
-BUS=="scsi", SYSFS{vendor}=="?IBM-ESXS", NAME="boot_disk%n-1"
-BUS=="scsi", SYSFS{vendor}=="IBM-ESXS?", NAME="boot_disk%n-2"
-BUS=="scsi", SYSFS{vendor}=="IBM-ES??", NAME="boot_disk%n"
-BUS=="scsi", SYSFS{vendor}=="IBM-ESXSS", NAME="boot_disk%n-3"
+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
        },
        {
@@ -70,8 +89,8 @@ EOF
                devpath         => "/block/sda/sda1",
                exp_name        => "boot_disk1" ,
                rules           => <<EOF
-BUS=="scsi", SYSFS{vendor}=="IBM-ESXS", SYSFS{model}=="ST336605LW   !#", NAME="boot_diskX%n"
-BUS=="scsi", SYSFS{vendor}=="IBM-ESXS", SYSFS{model}=="ST336605LW    !#", NAME="boot_disk%n"
+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
        },
        {
@@ -80,8 +99,8 @@ EOF
                devpath         => "/block/sda/sda1",
                exp_name        => "boot_disk1" ,
                rules           => <<EOF
-BUS=="scsi", SYSFS{vendor}=="IBM-ESXS", SYSFS{model}=="ST336605LW    !#", SYSFS{scsi_level}=="4", SYSFS{rev}=="B245", SYSFS{type}=="2", SYSFS{queue_depth}=="32", NAME="boot_diskXX%n"
-BUS=="scsi", SYSFS{vendor}=="IBM-ESXS", SYSFS{model}=="ST336605LW    !#", SYSFS{scsi_level}=="4", SYSFS{rev}=="B245", SYSFS{type}=="0", NAME="boot_disk%n"
+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
        },
        {
@@ -232,62 +251,82 @@ 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" ,
                rules           => <<EOF
-BUS=="scsi", ID=="0:0:0:0", NAME="first_disk%n"
+SUBSYSTEMS=="scsi", KERNELS=="0:0:0:0", NAME="first_disk%n"
+EOF
+       },
+       {
+               desc            => "test substitution chars (old key names)",
+               subsys          => "block",
+               devpath         => "/block/sda/sda3",
+               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",
+               desc            => "test substitution chars",
                subsys          => "block",
                devpath         => "/block/sda/sda3",
-               exp_name        => "Major:8:minor:3:kernelnumber:3:bus:0:0:0:0" ,
+               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:bus:%b"
+SUBSYSTEMS=="scsi", KERNELS=="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 (with length limit)",
                subsys          => "block",
                devpath         => "/block/sda/sda3",
                exp_name        => "M8-m3-n3-b0:0-sIBM" ,
                rules           => <<EOF
-BUS=="scsi", ID=="0:0:0:0", NAME="M%M-m%m-n%n-b%3b-s%3s{vendor}"
+SUBSYSTEMS=="scsi", KERNELS=="0:0:0:0", NAME="M%M-m%m-n%n-b%3b-s%3s{vendor}"
 EOF
        },
        {
-               desc            => "sustitution of sysfs value (%s{file})",
+               desc            => "import of shell-value file",
                subsys          => "block",
                devpath         => "/block/sda",
-               exp_name        => "disk-IBM-ESXS-sda" ,
+               exp_name        => "subdir/info/node" ,
                rules           => <<EOF
-BUS=="scsi", SYSFS{vendor}=="IBM-ESXS", NAME="disk-%s{vendor}-%k"
+SUBSYSTEMS=="scsi", IMPORT{file}="udev-test.conf", NAME="subdir/%E{udev_log}/node"
 KERNEL=="ttyUSB0", NAME="visor"
 EOF
        },
        {
-               desc            => "program result substitution",
+               desc            => "import of shell-value returned from program",
                subsys          => "block",
-               devpath         => "/block/sda/sda3",
-               exp_name        => "special-device-3" ,
+               devpath         => "/block/sda",
+               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            => "sustitution of sysfs value (%s{file})",
+               subsys          => "block",
+               devpath         => "/block/sda",
+               exp_name        => "disk-IBM-ESXS-sda" ,
                rules           => <<EOF
-BUS=="scsi", PROGRAM=="/bin/echo -n special-device", RESULT=="-special-*", NAME="%c-1-%n"
-BUS=="scsi", PROGRAM=="/bin/echo -n special-device", RESULT=="special--*", NAME="%c-2-%n"
-BUS=="scsi", PROGRAM=="/bin/echo -n special-device", RESULT=="special-device-", NAME="%c-3-%n"
-BUS=="scsi", PROGRAM=="/bin/echo -n special-device", RESULT=="special-devic", NAME="%c-4-%n"
-BUS=="scsi", PROGRAM=="/bin/echo -n special-device", RESULT=="special-*", NAME="%c-%n"
+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" ,
+               exp_name        => "special-device-3" ,
                rules           => <<EOF
-BUS=="scsi", PROGRAM=="/bin/echo", RESULT=="block", NAME="subsys_block"
+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
        },
        {
@@ -296,7 +335,7 @@ EOF
                devpath         => "/block/sda/sda3",
                exp_name        => "newline_removed" ,
                rules           => <<EOF
-BUS=="scsi", PROGRAM=="/bin/echo test", RESULT=="test", NAME="newline_removed"
+SUBSYSTEMS=="scsi", PROGRAM=="/bin/echo test", RESULT=="test", NAME="newline_removed"
 EOF
        },
        {
@@ -305,7 +344,7 @@ EOF
                devpath         => "/block/sda/sda3",
                exp_name        => "test-0:0:0:0" ,
                rules           => <<EOF
-BUS=="scsi", PROGRAM=="/bin/echo -n test-%b", RESULT=="test-0:0*", NAME="%c"
+SUBSYSTEMS=="scsi", PROGRAM=="/bin/echo -n test-%b", RESULT=="test-0:0*", NAME="%c"
 EOF
        },
        {
@@ -314,7 +353,7 @@ EOF
                devpath         => "/block/sda/sda3",
                exp_name        => "escape-3" ,
                rules           => <<EOF
-BUS=="scsi", PROGRAM=="/bin/echo -n escape-%%n", KERNEL=="sda3", NAME="%c"
+SUBSYSTEMS=="scsi", PROGRAM=="/bin/echo -n escape-%%n", KERNEL=="sda3", NAME="%c"
 EOF
        },
        {
@@ -323,7 +362,7 @@ EOF
                devpath         => "/block/sda/sda3",
                exp_name        => "foo9" ,
                rules           => <<EOF
-BUS=="scsi", PROGRAM=="/bin/echo -n foo3 foo4 foo5 foo6 foo7 foo8 foo9", KERNEL=="sda3", NAME="%c{7}"
+SUBSYSTEMS=="scsi", PROGRAM=="/bin/echo -n foo3 foo4 foo5 foo6 foo7 foo8 foo9", KERNEL=="sda3", NAME="%c{7}"
 EOF
        },
        {
@@ -332,7 +371,7 @@ EOF
                devpath         => "/block/sda/sda3",
                exp_name        => "bar9" ,
                rules           => <<EOF
-BUS=="scsi", PROGRAM=="/bin/sh -c 'echo foo3 foo4 foo5 foo6 foo7 foo8 foo9 | sed  s/foo9/bar9/'", KERNEL=="sda3", NAME="%c{7}"
+SUBSYSTEMS=="scsi", PROGRAM=="/bin/sh -c 'echo foo3 foo4 foo5 foo6 foo7 foo8 foo9 | sed  s/foo9/bar9/'", KERNEL=="sda3", NAME="%c{7}"
 EOF
        },
        {
@@ -341,7 +380,7 @@ EOF
                devpath         => "/block/sda/sda3",
                exp_name        => "foo7" ,
                rules           => <<EOF
-BUS=="scsi", PROGRAM=="/bin/echo -n 'foo3 foo4'   'foo5   foo6   foo7 foo8'", KERNEL=="sda3", NAME="%c{5}"
+SUBSYSTEMS=="scsi", PROGRAM=="/bin/echo -n 'foo3 foo4'   'foo5   foo6   foo7 foo8'", KERNEL=="sda3", NAME="%c{5}"
 EOF
        },
        {
@@ -350,7 +389,7 @@ EOF
                devpath         => "/block/sda/sda3",
                exp_name        => "my-foo9" ,
                rules           => <<EOF
-BUS=="scsi", PROGRAM=="/bin/echo -n foo3 foo4 foo5 foo6 foo7 foo8 foo9", KERNEL=="sda3", NAME="my-%c{7}"
+SUBSYSTEMS=="scsi", PROGRAM=="/bin/echo -n foo3 foo4 foo5 foo6 foo7 foo8 foo9", KERNEL=="sda3", NAME="my-%c{7}"
 EOF
        },
        {
@@ -359,46 +398,81 @@ EOF
                devpath         => "/block/sda/sda3",
                exp_name        => "my-foo8" ,
                rules           => <<EOF
-BUS=="scsi", PROGRAM=="/bin/echo -n foo3 foo4 foo5 foo6 foo7 foo8 foo9", KERNEL=="sda3", NAME="my-%c{6}"
+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" ,
+               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
-BUS=="scsi", PROGRAM=="/bin/echo -n foo", RESULT=="foo", NAME="foo"
-KERNEL=="console", NAME="TTY"
+SUBSYSTEMS=="scsi", KERNELS=="0:0:0:0", NAME="Major:\$major-minor:\$minor-kernelnumber:\$number-id:\$id"
+EOF
+       },
+       {
+               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            => "valid program for device with no bus",
+               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" ,
+               exp_name        => "TTY",
                rules           => <<EOF
-PROGRAM=="/bin/echo -n foo", RESULT=="foo", NAME="foo"
+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" ,
                rules           => <<EOF
-BUS=="foo", SYSFS{dev}=="5:1", NAME="foo"
+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" ,
                rules           => <<EOF
-SYSFS{dev}=="5:1", NAME="foo"
+ATTRS{dev}=="5:1", NAME="foo"
 KERNEL=="console", NAME="TTY"
 EOF
        },
@@ -408,9 +482,9 @@ EOF
                devpath         => "/block/sda",
                exp_name        => "scsi-0:0:0:0" ,
                rules           => <<EOF
-BUS=="usb", PROGRAM=="/bin/echo -n usb-%b", NAME="%c"
-BUS=="scsi", PROGRAM=="/bin/echo -n scsi-%b", NAME="%c"
-BUS=="foo", PROGRAM=="/bin/echo -n foo-%b", NAME="%c"
+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
        },
        {
@@ -420,7 +494,7 @@ EOF
                exp_name        => "boot_disk15" ,
                exp_majorminor  => "8:15",
                rules           => <<EOF
-BUS=="scsi", SYSFS{vendor}=="IBM-ESXS", NAME{all_partitions}="boot_disk"
+SUBSYSTEMS=="scsi", ATTRS{vendor}=="IBM-ESXS", NAME{all_partitions}="boot_disk"
 EOF
        },
        {
@@ -429,7 +503,7 @@ EOF
                devpath         => "/class/tty/ttyUSB0",
                exp_name        => "visor" ,
                rules           => <<EOF
-SYSFS{idProduct}=="2008", NAME="visor"
+ATTRS{idProduct}=="2008", NAME="visor"
 EOF
        },
        {
@@ -438,7 +512,7 @@ EOF
                devpath         => "/block/rd!c0d0",
                exp_name        => "rd/c0d0" ,
                rules           => <<EOF
-BUS=="scsi", NAME="%k"
+SUBSYSTEMS=="scsi", NAME="%k"
 KERNEL=="ttyUSB0", NAME="visor"
 EOF
        },
@@ -457,73 +531,91 @@ EOF
                devpath         => "/block/cciss!c0d0/cciss!c0d0p1",
                exp_name        => "cciss/c0d0p1" ,
                rules           => <<EOF
-BUS=="scsi", NAME="%k"
+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",
                rules           => <<EOF
-BUS=="usb", ID=="0:0:0:0", NAME="not-scsi"
-BUS=="scsi", ID=="0:0:0:1", NAME="no-match"
-BUS=="scsi", ID==":0", NAME="short-id"
-BUS=="scsi", ID=="/0:0:0:0", NAME="no-match"
-BUS=="scsi", ID=="0:0:0:0", NAME="scsi-0:0:0:0"
+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",
                rules           => <<EOF
-BUS=="scsi", ID=="*:1", NAME="no-match"
-BUS=="scsi", ID=="*:0:1", NAME="no-match"
-BUS=="scsi", ID=="*:0:0:1", NAME="no-match"
-BUS=="scsi", ID=="*", NAME="scsi-0:0:0:0"
-BUS=="scsi", ID=="0:0:0:0", NAME="bad"
+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",
                rules           => <<EOF
-BUS=="scsi", ID=="*:0", NAME="scsi-0:0:0:0"
-BUS=="scsi", ID=="0:0:0:0", NAME="bad"
+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",
                rules           => <<EOF
-BUS=="scsi", ID=="*:0:0:0", NAME="scsi-0:0:0:0"
-BUS=="scsi", ID=="0:0:0:0", NAME="bad"
+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            => "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 SYSFS attribute whitespace",
+               desc            => "ignore ATTRS attribute whitespace",
                subsys          => "block",
                devpath         => "/block/sda",
                exp_name        => "ignored",
                rules           => <<EOF
-BUS=="scsi", SYSFS{whitespace_test}=="WHITE  SPACE", NAME="ignored"
+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",
                rules           => <<EOF
-BUS=="scsi", SYSFS{whitespace_test}=="WHITE  SPACE ", NAME="wrong-to-ignore"
-BUS=="scsi", SYSFS{whitespace_test}=="WHITE  SPACE   ", NAME="matched-with-space"
+SUBSYSTEMS=="scsi", ATTRS{whitespace_test}=="WHITE  SPACE ", NAME="wrong-to-ignore"
+SUBSYSTEMS=="scsi", ATTRS{whitespace_test}=="WHITE  SPACE   ", NAME="matched-with-space"
 EOF
        },
        {
@@ -543,7 +635,7 @@ EOF
                exp_name        => "node",
                exp_perms       => "5000::0660",
                rules           => <<EOF
-BUS=="scsi", KERNEL=="sda", NAME="node", OWNER="5000"
+SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="node", OWNER="5000"
 EOF
        },
        {
@@ -553,7 +645,7 @@ EOF
                exp_name        => "node",
                exp_perms       => ":100:0660",
                rules           => <<EOF
-BUS=="scsi", KERNEL=="sda", NAME="node", GROUP="100"
+SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="node", GROUP="100"
 EOF
        },
        {
@@ -563,7 +655,7 @@ EOF
                exp_name        => "node",
                exp_perms       => "nobody::0660",
                rules           => <<EOF
-BUS=="scsi", KERNEL=="sda", NAME="node", OWNER="nobody"
+SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="node", OWNER="nobody"
 EOF
        },
        {
@@ -573,7 +665,7 @@ EOF
                exp_name        => "node",
                exp_perms       => ":daemon:0660",
                rules           => <<EOF
-BUS=="scsi", KERNEL=="sda", NAME="node", GROUP="daemon"
+SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="node", GROUP="daemon"
 EOF
        },
        {
@@ -583,7 +675,7 @@ EOF
                exp_name        => "node",
                exp_perms       => "root:mail:0660",
                rules           => <<EOF
-BUS=="scsi", KERNEL=="sda", NAME="node", OWNER="root", GROUP="mail"
+SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="node", OWNER="root", GROUP="mail"
 EOF
        },
        {
@@ -593,7 +685,7 @@ EOF
                exp_name        => "node",
                exp_perms       => "::0777",
                rules           => <<EOF
-BUS=="scsi", KERNEL=="sda", NAME="node", MODE="0777"
+SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="node", MODE="0777"
 EOF
        },
        {
@@ -603,7 +695,7 @@ EOF
                exp_name        => "node",
                exp_perms       => "5000:100:0777",
                rules           => <<EOF
-BUS=="scsi", KERNEL=="sda", NAME="node", OWNER="5000", GROUP="100", MODE="0777"
+SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="node", OWNER="5000", GROUP="100", MODE="0777"
 EOF
        },
        {
@@ -693,7 +785,7 @@ EOF
                exp_name        => "node",
                exp_majorminor  => "8:0",
                rules           => <<EOF
-BUS=="scsi", KERNEL=="sda", NAME="node"
+SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="node"
 EOF
        },
        {
@@ -734,6 +826,17 @@ EOF
                exp_target      => "ttyUSB0",
                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
        },
        {
@@ -753,7 +856,7 @@ EOF
                exp_name        => "1/2/symlink" ,
                exp_target      => "a/b/node",
                rules           => <<EOF
-BUS=="scsi", SYSFS{vendor}=="IBM-ESXS", NAME="1/2/a/b/node", SYMLINK="1/2/symlink"
+SUBSYSTEMS=="scsi", ATTRS{vendor}=="IBM-ESXS", NAME="1/2/a/b/node", SYMLINK="1/2/symlink"
 EOF
        },
        {
@@ -763,7 +866,7 @@ EOF
                exp_name        => "1/2/c/d/symlink" ,
                exp_target      => "../../a/b/node",
                rules           => <<EOF
-BUS=="scsi", SYSFS{vendor}=="IBM-ESXS", NAME="1/2/a/b/node", SYMLINK="1/2/c/d/symlink"
+SUBSYSTEMS=="scsi", ATTRS{vendor}=="IBM-ESXS", NAME="1/2/a/b/node", SYMLINK="1/2/c/d/symlink"
 EOF
        },
        {
@@ -783,9 +886,9 @@ EOF
                exp_name        => "symlink-only2",
                exp_target      => "link",
                rules           => <<EOF
-BUS=="scsi", KERNEL=="sda", SYMLINK="symlink-only1"
-BUS=="scsi", KERNEL=="sda", SYMLINK="symlink-only2"
-BUS=="scsi", KERNEL=="sda", NAME="link", SYMLINK="symlink0"
+SUBSYSTEMS=="scsi", KERNEL=="sda", SYMLINK+="symlink-only1"
+SUBSYSTEMS=="scsi", KERNEL=="sda", SYMLINK+="symlink-only2"
+SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="link", SYMLINK+="symlink0"
 EOF
        },
        {
@@ -797,7 +900,7 @@ EOF
                exp_add_error   => "yes",
                exp_rem_error   => "yes",
                rules           => <<EOF
-BUS=="scsi", KERNEL=="sda", NAME="link", SYMLINK="."
+SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="link", SYMLINK+="."
 EOF
        },
        {
@@ -806,10 +909,11 @@ EOF
                devpath         => "/class/tty/tty0",
                exp_name        => "link",
                exp_target      => "link",
+               exp_add_error   => "yes",
                exp_rem_error   => "yes",
                option          => "clean",
                rules           => <<EOF
-KERNEL=="tty0", NAME="link", SYMLINK="link"
+KERNEL=="tty0", NAME="link", SYMLINK+="link"
 EOF
        },
        {
@@ -819,7 +923,7 @@ EOF
                exp_name        => "symlink0",
                exp_target      => "ttyUSB0",
                rules           => <<EOF
-KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="symlink%n"
+KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK+="symlink%n"
 EOF
        },
        {
@@ -829,7 +933,7 @@ EOF
                exp_name        => "symlink-ttyUSB0",
                exp_target      => "ttyUSB0",
                rules           => <<EOF
-KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="symlink-%k"
+KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK+="symlink-%k"
 EOF
        },
        {
@@ -839,7 +943,7 @@ EOF
                exp_name        => "major-188:0",
                exp_target      => "ttyUSB0",
                rules           => <<EOF
-KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="major-%M:%m"
+KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK+="major-%M:%m"
 EOF
        },
        {
@@ -849,7 +953,7 @@ EOF
                exp_name        => "symlink-0:0:0:0",
                exp_target      => "node",
                rules           => <<EOF
-BUS=="scsi", KERNEL=="sda", NAME="node", SYMLINK="symlink-%b"
+SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="node", SYMLINK+="symlink-%b"
 EOF
        },
        {
@@ -859,7 +963,7 @@ EOF
                exp_name        => "test",
                exp_target      => "ttyUSB0",
                rules           => <<EOF
-KERNEL=="ttyUSB[0-9]*", PROGRAM=="/bin/echo test" NAME="ttyUSB%n", SYMLINK="%c"
+KERNEL=="ttyUSB[0-9]*", PROGRAM=="/bin/echo test" NAME="ttyUSB%n", SYMLINK+="%c"
 EOF
        },
        {
@@ -869,7 +973,7 @@ EOF
                exp_name        => "test",
                exp_target      => "ttyUSB0",
                rules           => <<EOF
-KERNEL=="ttyUSB[0-9]*", PROGRAM=="/bin/echo symlink test this" NAME="ttyUSB%n", SYMLINK="%c{2}"
+KERNEL=="ttyUSB[0-9]*", PROGRAM=="/bin/echo symlink test this" NAME="ttyUSB%n", SYMLINK+="%c{2}"
 EOF
        },
        {
@@ -879,7 +983,7 @@ EOF
                exp_name        => "this",
                exp_target      => "ttyUSB0",
                rules           => <<EOF
-KERNEL=="ttyUSB[0-9]*", PROGRAM=="/bin/echo symlink test this" NAME="ttyUSB%n", SYMLINK="%c{2+}"
+KERNEL=="ttyUSB[0-9]*", PROGRAM=="/bin/echo symlink test this" NAME="ttyUSB%n", SYMLINK+="%c{2+}"
 EOF
        },
        {
@@ -889,8 +993,8 @@ EOF
                exp_name        => "test",
                exp_target      => "link",
                rules           => <<EOF
-BUS=="scsi", KERNEL=="sda", PROGRAM=="/bin/echo link test this" SYMLINK="%c{2+}"
-BUS=="scsi", KERNEL=="sda", NAME="link", SYMLINK="symlink0"
+SUBSYSTEMS=="scsi", KERNEL=="sda", PROGRAM=="/bin/echo link test this" SYMLINK+="%c{2+}"
+SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="link", SYMLINK+="symlink0"
 EOF
        },
        {
@@ -900,7 +1004,7 @@ EOF
                exp_name        => "188:0",
                exp_target      => "ttyUSB0",
                rules           => <<EOF
-KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="%s{dev}"
+KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK+="%s{dev}"
 EOF
        },
        {
@@ -910,27 +1014,7 @@ EOF
                exp_name        => "188",
                exp_target      => "ttyUSB0",
                rules           => <<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",
-               rules           => <<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",
-               rules           => <<EOF
-KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="%%%k_name"
+KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK+="%3s{dev}"
 EOF
        },
        {
@@ -940,7 +1024,7 @@ EOF
                exp_name        => "link1",
                exp_target      => "node",
                rules           => <<EOF
-BUS=="scsi", PROGRAM=="/bin/echo -n node link1 link2", RESULT=="node *", NAME="%c{1}", SYMLINK="%c{2} %c{3}"
+SUBSYSTEMS=="scsi", PROGRAM=="/bin/echo -n node link1 link2", RESULT=="node *", NAME="%c{1}", SYMLINK+="%c{2} %c{3}"
 EOF
        },
        {
@@ -950,85 +1034,18 @@ EOF
                exp_name        => "link4",
                exp_target      => "node",
                rules           => <<EOF
-BUS=="scsi", PROGRAM=="/bin/echo -n node link1 link2 link3 link4", RESULT=="node *", NAME="%c{1}", SYMLINK="%c{2+}"
-EOF
-       },
-       {
-               desc            => "enumeration char test (single test)",
-               subsys          => "block",
-               devpath         => "/block/sda",
-               exp_name        => "cdrom",
-               rules           => <<EOF
-KERNEL=="sda", NAME="cdrom%e"
-EOF
-       },
-       {
-               desc            => "enumeration char test sequence 1/5 (keep)",
-               subsys          => "block",
-               devpath         => "/block/sda",
-               exp_name        => "cdrom",
-               option          => "keep",
-               rules           => <<EOF
-KERNEL=="sda", NAME="cdrom%e"
-EOF
-       },
-       {
-               desc            => "enumeration char test sequence 2/5 (keep)",
-               subsys          => "block",
-               devpath         => "/block/sda/sda1",
-               exp_name        => "enum",
-               option          => "keep",
-               rules           => <<EOF
-KERNEL=="sda1", NAME="enum%e"
-EOF
-       },
-       {
-               desc            => "enumeration char test sequence 3/5 (keep)",
-               subsys          => "block",
-               devpath         => "/block/sda/sda2",
-               exp_name        => "cdrom1",
-               option          => "keep",
-               rules           => <<EOF
-KERNEL=="sda2", NAME="cdrom%e"
-EOF
-       },
-       {
-               desc            => "enumeration char test sequence 4/5 (keep)",
-               subsys          => "block",
-               devpath         => "/block/sda/sda3",
-               exp_name        => "enum1",
-               option          => "keep",
-               rules           => <<EOF
-KERNEL=="sda3", NAME="enum%e"
-EOF
-       },
-       {
-               desc            => "enumeration char test sequence 5/5 (clean)",
-               subsys          => "block",
-               devpath         => "/block/sda/sda4",
-               exp_name        => "cdrom2",
-               option          => "clean",
-               rules           => <<EOF
-KERNEL=="sda4", NAME="cdrom%e"
-EOF
-       },
-       {
-               desc            => "enumeration char test after cleanup (single test)",
-               subsys          => "block",
-               devpath         => "/block/sda",
-               exp_name        => "cdrom",
-               rules           => <<EOF
-KERNEL=="sda", NAME="cdrom%e"
+SUBSYSTEMS=="scsi", PROGRAM=="/bin/echo -n node link1 link2 link3 link4", RESULT=="node *", NAME="%c{1}", SYMLINK+="%c{2+}"
 EOF
        },
        {
                desc            => "ignore rule test",
                subsys          => "block",
                devpath         => "/block/sda",
-               exp_name        => "node",
+               exp_name        => "nothing",
+               not_exp_name    => "node",
                exp_add_error   => "yes",
                rules           => <<EOF
-BUS=="scsi", KERNEL=="sda", NAME="node", OPTIONS="ignore"
+SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="node", OPTIONS="ignore"
 EOF
        },
        {
@@ -1038,7 +1055,7 @@ EOF
                exp_name        => "node6",
                rules           => <<EOF
 SUBSYSTEM=="block", OPTIONS="all_partitions"
-BUS=="scsi", KERNEL=="sda", NAME="node"
+SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="node"
 EOF
        },
        {
@@ -1049,7 +1066,7 @@ EOF
                exp_add_error   => "yes",
                rules           => <<EOF
 SUBSYSTEM=="block", OPTIONS="all_partitions"
-BUS=="scsi", KERNEL=="sda", NAME="node"
+SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="node"
 EOF
        },
        {
@@ -1059,7 +1076,7 @@ EOF
                exp_name        => "node",
                exp_rem_error   => "yes",
                rules           => <<EOF
-BUS=="scsi", KERNEL=="sda", NAME="node", OPTIONS="ignore_remove"
+SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="node", OPTIONS="ignore_remove"
 EOF
        },
        {
@@ -1070,7 +1087,7 @@ EOF
                exp_rem_error   => "yes",
                option          => "clean",
                rules           => <<EOF
-BUS=="scsi", KERNEL=="sda", NAME="node", OPTIONS="ignore_remove, all_partitions"
+SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="node", OPTIONS="ignore_remove, all_partitions"
 EOF
        },
        {
@@ -1079,19 +1096,19 @@ EOF
                devpath         => "/block/sda",
                exp_name        => "node",
                rules           => <<EOF
-BUS=="scsi", KERNEL=="sda", NAME="should_not_match", SUBSYSTEM=="vc"
-BUS=="scsi", KERNEL=="sda", NAME="node", SUBSYSTEM=="block"
-BUS=="scsi", KERNEL=="sda", NAME="should_not_match2", SUBSYSTEM=="vc"
+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            => "DRIVER match test",
+               desc            => "DRIVERS match test",
                subsys          => "block",
                devpath         => "/block/sda",
                exp_name        => "node",
                rules           => <<EOF
-BUS=="scsi", KERNEL=="sda", NAME="should_not_match", DRIVER=="sd-wrong"
-BUS=="scsi", KERNEL=="sda", NAME="node", DRIVER=="sd"
+SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="should_not_match", DRIVERS=="sd-wrong"
+SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="node", DRIVERS=="sd"
 EOF
        },
        {
@@ -1100,7 +1117,7 @@ EOF
                devpath         => "/block/sda",
                exp_name        => "node",
                rules           => <<EOF
-BUS=="scsi", KERNEL=="sda", PROGRAM=="/usr/bin/test -b %N" NAME="node"
+SUBSYSTEMS=="scsi", KERNEL=="sda", PROGRAM=="/usr/bin/test -b %N" NAME="node"
 EOF
        },
        {
@@ -1109,7 +1126,7 @@ EOF
                devpath         => "/block/sda",
                exp_name        => "sda",
                rules           => <<EOF
-BUS=="scsi", KERNEL=="sda", PROGRAM=="/bin/echo %p", RESULT=="/block/sda" NAME="%k"
+SUBSYSTEMS=="scsi", KERNEL=="sda", PROGRAM=="/bin/echo %p", RESULT=="/block/sda" NAME="%k"
 EOF
        },
        {
@@ -1119,7 +1136,7 @@ EOF
                exp_name        => "main_device",
                option          => "keep",
                rules           => <<EOF
-BUS=="scsi", KERNEL=="sda", NAME="main_device"
+SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="main_device"
 EOF
        },
        {
@@ -1129,7 +1146,7 @@ EOF
                exp_name        => "main_device-part-1",
                option          => "clean",
                rules           => <<EOF
-BUS=="scsi", KERNEL=="sda1", NAME="%P-part-1"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", NAME="%P-part-1"
 EOF
        },
        {
@@ -1138,7 +1155,7 @@ EOF
                devpath         => "/block/sda/sda1",
                exp_name        => "start-udev-root-end",
                rules           => <<EOF
-BUS=="scsi", KERNEL=="sda1", NAME="start-%r-end"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", NAME="start-%r-end"
 EOF
        },
        {
@@ -1147,8 +1164,8 @@ EOF
                devpath         => "/block/sda/sda1",
                exp_name        => "last",
                rules           => <<EOF
-BUS=="scsi", KERNEL=="sda1", SYMLINK="last", OPTIONS="last_rule"
-BUS=="scsi", KERNEL=="sda1", NAME="very-last"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", SYMLINK+="last", OPTIONS="last_rule"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", NAME="very-last"
 EOF
        },
        {
@@ -1157,9 +1174,9 @@ EOF
                devpath         => "/block/sda/sda1",
                exp_name        => "match",
                rules           => <<EOF
-BUS=="scsi", KERNEL!="sda1", NAME="matches-but-is-negated"
-BUS=="scsi", KERNEL!="xsda1", NAME="match"
-BUS=="scsi", KERNEL=="sda1", NAME="wrong"
+SUBSYSTEMS=="scsi", KERNEL!="sda1", NAME="matches-but-is-negated"
+SUBSYSTEMS=="scsi", KERNEL!="xsda1", NAME="match"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", NAME="wrong"
 EOF
        },
        {
@@ -1168,9 +1185,9 @@ EOF
                devpath         => "/block/sda/sda1",
                exp_name        => "not-anything",
                rules           => <<EOF
-BUS=="scsi", SUBSYSTEM=="block", KERNEL!="sda1", NAME="matches-but-is-negated"
-BUS=="scsi", SUBSYSTEM!="anything", NAME="not-anything"
-BUS=="scsi", KERNEL=="sda1", NAME="wrong"
+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
        },
        {
@@ -1180,7 +1197,7 @@ EOF
                exp_name        => "nonzero-program",
                rules           => <<EOF
 KERNEL=="sda1", PROGRAM!="/bin/false", NAME="nonzero-program"
-BUS=="scsi", KERNEL=="sda1", NAME="wrong"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", NAME="wrong"
 EOF
        },
        {
@@ -1190,7 +1207,7 @@ EOF
                exp_name        => "true",
                rules           => <<EOF
 KERNEL   ==   "sda1"     ,    NAME   =    "true"
-BUS=="scsi", KERNEL=="sda1", NAME="wrong"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", NAME="wrong"
 EOF
        },
        {
@@ -1199,9 +1216,9 @@ EOF
                devpath         => "/block/sda/sda1",
                exp_name        => "true",
                rules           => <<EOF
-BUS=="scsi", KERNEL=="sda1", ENV{ENV_KEY_TEST}=="go", NAME="wrong"
-BUS=="scsi", KERNEL=="sda1", ENV{ENV_KEY_TEST}=="test", NAME="true"
-BUS=="scsi", KERNEL=="sda1", ENV{ENV_KEY_TEST}=="bad", NAME="bad"
+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
        },
        {
@@ -1210,10 +1227,48 @@ EOF
                devpath         => "/block/sda/sda1",
                exp_name        => "true",
                rules           => <<EOF
-BUS=="scsi", KERNEL=="sda1", ENV{ENV_KEY_TEST}=="go", NAME="wrong"
-BUS=="scsi", KERNEL=="sda1", ENV{ENV_KEY_TEST}=="yes", ENV{ACTION}=="add", ENV{DEVPATH}=="/block/sda/sdax1", NAME="no"
-BUS=="scsi", KERNEL=="sda1", ENV{ENV_KEY_TEST}=="test", ENV{ACTION}=="add", ENV{DEVPATH}=="/block/sda/sda1", NAME="true"
-BUS=="scsi", KERNEL=="sda1", ENV{ENV_KEY_TEST}=="bad", NAME="bad"
+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
        },
        {
@@ -1222,7 +1277,25 @@ EOF
                devpath         => "/block/sda/sda1",
                exp_name        => "sane",
                rules           => <<EOF
-BUS=="scsi", KERNEL=="sda1", PROGRAM=="/bin/echo -e name; (/sbin/badprogram)", RESULT="name_ _/sbin/badprogram_", NAME="sane"
+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
        },
        {
@@ -1240,10 +1313,10 @@ EOF
                devpath         => "/block/sda",
                exp_name        => "ok",
                rules           => <<EOF
-KERNEL=="sda", SYSFS{nothing}!="", NAME="not-1-ok"
-KERNEL=="sda", SYSFS{nothing}=="", NAME="not-2-ok"
-KERNEL=="sda", SYSFS{vendor}!="", NAME="ok"
-KERNEL=="sda", SYSFS{vendor}=="", NAME="not-3-ok"
+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
        },
        {
@@ -1290,7 +1363,7 @@ EOF
                exp_rem_error   => "yes",
                option          => "clean",
                rules           => <<EOF
-KERNEL=="sda", NAME="ok", RUN+="/bin/sh -c 'ln -s `basename \$DEVNAME` %r/testsymlink'"
+KERNEL=="sda", NAME="ok", RUN+="/bin/sh -c 'ln -s `basename \$\$DEVNAME` %r/testsymlink'"
 KERNEL=="sda", NAME="not-ok"
 EOF
        },
@@ -1327,6 +1400,221 @@ EOF
 KERNEL=="sda", GROUP:="nobody"
 SUBSYSTEM=="block", MODE:="640"
 KERNEL=="sda", GROUP="not-ok", MODE="0666", NAME="ok"
+EOF
+       },
+       {
+               desc            => "env substitution",
+               subsys          => "block",
+               devpath         => "/block/sda",
+               exp_name        => "node-add-me",
+               rules           => <<EOF
+KERNEL=="sda", MODE="0666", NAME="node-\$env{ACTION}-me"
+EOF
+       },
+       {
+               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        => "parent",
+               option          => "keep",
+               rules           => <<EOF
+KERNEL=="sda", IMPORT="/bin/echo -e \'PARENT_KEY=parent_right\\nWRONG_PARENT_KEY=parent_wrong'"
+KERNEL=="sda", NAME="parent"
+EOF
+       },
+       {
+               desc            => "IMPORT parent test sequence 2/2 (keep)",
+               subsys          => "block",
+               devpath         => "/block/sda/sda1",
+               exp_name        => "parentenv-parent_right",
+               option          => "clean",
+               rules           => <<EOF
+KERNEL=="sda1", IMPORT{parent}="PARENT*", NAME="parentenv-\$env{PARENT_KEY}\$env{WRONG_PARENT_KEY}"
+EOF
+       },
+       {
+               desc            => "GOTO test",
+               subsys          => "block",
+               devpath         => "/block/sda/sda1",
+               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
        },
 );
@@ -1335,9 +1623,6 @@ EOF
 $ENV{ENV_KEY_TEST} = "test";
 $ENV{SYSFS_PATH} = $sysfs;
 $ENV{UDEV_CONFIG_FILE} = $udev_conf;
-$ENV{UDEV_NO_DEVD} = "yes";
-$ENV{UDEV_NO_HOTPLUGD} = "yes";
-
 
 sub udev {
        my ($action, $subsys, $devpath, $rules) = @_;
@@ -1466,6 +1751,13 @@ sub run_test {
                my ($dev, $ino, $mode, $nlink, $uid, $gid, $rdev, $size,
                    $atime, $mtime, $ctime, $blksize, $blocks) = stat("$PWD/$udev_root$rules->{exp_name}");
 
+               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);
                }
@@ -1512,7 +1804,6 @@ sub run_test {
        print "\n";
 
        if (defined($rules->{option}) && $rules->{option} eq "clean") {
-               system("rm -rf $udev_db");
                system("rm -rf $udev_root");
                mkdir($udev_root) || die "unable to create udev_root: $udev_root\n";
        }
@@ -1533,8 +1824,8 @@ mkdir($udev_root) || die "unable to create udev_root: $udev_root\n";
 # 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=\"$udev_rules\"\n";
+print CONF "udev_log=\"info\"\n";
 close CONF;
 
 my $test_num = 1;
@@ -1562,7 +1853,6 @@ if ($ARGV[0]) {
 print "$error errors occured\n\n";
 
 # cleanup
-system("rm -rf $udev_db");
 system("rm -rf $udev_root");
 unlink($udev_rules);
 unlink($udev_conf);