chiark / gitweb /
remove 'udevadm trigger --type=failed' and SYSFS, ID, BUS keys
[elogind.git] / test / udev-test.pl
index fafaa96..f93859c 100755 (executable)
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# udev-test
+# udev test
 #
 # Provides automated testing of the udev binary.
 # The whole test is self contained in this file, except the matching sysfs tree.
 # 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-2011 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_conf  = "udev-test.conf";
-my $udev_rules = "udev-test.rules";
-
-# uncomment following line to run udev with valgrind.
-# Should make this a runtime option to the script someday...
-#my $udev_bin  = "valgrind --tool=memcheck --leak-check=yes   ../udev";
+my $PWD                        = $ENV{PWD};
+my $sysfs              = "test/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            => "no rules",
+               subsys          => "block",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
+               exp_name        => "sda" ,
+               exp_rem_error   => "yes",
+               rules           => <<EOF
+#
+EOF
+       },
+       {
                desc            => "label test of scsi disc",
                subsys          => "block",
-               devpath         => "/block/sda",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
                exp_name        => "boot_disk" ,
                rules           => <<EOF
-BUS=="scsi", SYSFS{vendor}=="IBM-ESXS", NAME="boot_disk%n"
-KERNEL=="ttyUSB0", NAME="visor"
+SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", SYMLINK+="boot_disk%n", RUN+="socket:@/org/kernel/udev/monitor"
+KERNEL=="ttyACM0", SYMLINK+="modem"
+EOF
+       },
+       {
+               desc            => "label test of scsi disc",
+               subsys          => "block",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
+               exp_name        => "boot_disk" ,
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", SYMLINK+="boot_disk%n"
+KERNEL=="ttyACM0", SYMLINK+="modem"
+EOF
+       },
+       {
+               desc            => "label test of scsi disc",
+               subsys          => "block",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
+               exp_name        => "boot_disk" ,
+               rules           => <<EOF
+SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", SYMLINK+="boot_disk%n"
+KERNEL=="ttyACM0", SYMLINK+="modem"
 EOF
        },
        {
                desc            => "label test of scsi partition",
                subsys          => "block",
-               devpath         => "/block/sda/sda1",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1",
                exp_name        => "boot_disk1" ,
                rules           => <<EOF
-BUS=="scsi", SYSFS{vendor}=="IBM-ESXS", NAME="boot_disk%n"
+SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", SYMLINK+="boot_disk%n"
 EOF
        },
        {
                desc            => "label test of pattern match",
                subsys          => "block",
-               devpath         => "/block/sda/sda1",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/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}=="?ATA", SYMLINK+="boot_disk%n-1"
+SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA?", SYMLINK+="boot_disk%n-2"
+SUBSYSTEMS=="scsi", ATTRS{vendor}=="A??", SYMLINK+="boot_disk%n"
+SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATAS", SYMLINK+="boot_disk%n-3"
 EOF
        },
        {
                desc            => "label test of multiple sysfs files",
                subsys          => "block",
-               devpath         => "/block/sda/sda1",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/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}=="ATA", ATTRS{model}=="ST910021AS X ", SYMLINK+="boot_diskX%n"
+SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", ATTRS{model}=="ST910021AS", SYMLINK+="boot_disk%n"
 EOF
        },
        {
-               desc            => "label test of max sysfs files",
+               desc            => "label test of max sysfs files (skip invalid rule)",
                subsys          => "block",
-               devpath         => "/block/sda/sda1",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/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}=="ATA", ATTRS{model}=="ST910021AS", ATTRS{scsi_level}=="6", ATTRS{rev}=="4.06", ATTRS{type}=="0", ATTRS{queue_depth}=="32", SYMLINK+="boot_diskXX%n"
+SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", ATTRS{model}=="ST910021AS", ATTRS{scsi_level}=="6", ATTRS{rev}=="4.06", ATTRS{type}=="0", SYMLINK+="boot_disk%n"
 EOF
        },
        {
                desc            => "catch device by *",
                subsys          => "tty",
-               devpath         => "/class/tty/ttyUSB0",
-               exp_name        => "visor/0" ,
+               devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
+               exp_name        => "modem/0" ,
                rules           => <<EOF
-KERNEL=="ttyUSB*", NAME="visor/%n"
+KERNEL=="ttyACM*", SYMLINK+="modem/%n"
 EOF
        },
        {
                desc            => "catch device by * - take 2",
                subsys          => "tty",
-               devpath         => "/class/tty/ttyUSB0",
-               exp_name        => "visor/0" ,
+               devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
+               exp_name        => "modem/0" ,
                rules           => <<EOF
-KERNEL=="*USB1", NAME="bad"
-KERNEL=="*USB0", NAME="visor/%n"
+KERNEL=="*ACM1", SYMLINK+="bad"
+KERNEL=="*ACM0", SYMLINK+="modem/%n"
 EOF
        },
        {
                desc            => "catch device by ?",
                subsys          => "tty",
-               devpath         => "/class/tty/ttyUSB0",
-               exp_name        => "visor/0" ,
+               devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
+               exp_name        => "modem/0" ,
                rules           => <<EOF
-KERNEL=="ttyUSB??*", NAME="visor/%n-1"
-KERNEL=="ttyUSB??", NAME="visor/%n-2"
-KERNEL=="ttyUSB?", NAME="visor/%n"
+KERNEL=="ttyACM??*", SYMLINK+="modem/%n-1"
+KERNEL=="ttyACM??", SYMLINK+="modem/%n-2"
+KERNEL=="ttyACM?", SYMLINK+="modem/%n"
 EOF
        },
        {
                desc            => "catch device by character class",
                subsys          => "tty",
-               devpath         => "/class/tty/ttyUSB0",
-               exp_name        => "visor/0" ,
+               devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
+               exp_name        => "modem/0" ,
                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"
+KERNEL=="ttyACM[A-Z]*", SYMLINK+="modem/%n-1"
+KERNEL=="ttyACM?[0-9]", SYMLINK+="modem/%n-2"
+KERNEL=="ttyACM[0-9]*", SYMLINK+="modem/%n"
 EOF
        },
        {
                desc            => "replace kernel name",
                subsys          => "tty",
-               devpath         => "/class/tty/ttyUSB0",
-               exp_name        => "visor" ,
+               devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
+               exp_name        => "modem" ,
                rules           => <<EOF
-KERNEL=="ttyUSB0", NAME="visor"
+KERNEL=="ttyACM0", SYMLINK+="modem"
 EOF
        },
        {
                desc            => "Handle comment lines in config file (and replace kernel name)",
                subsys          => "tty",
-               devpath         => "/class/tty/ttyUSB0",
-               exp_name        => "visor" ,
+               devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
+               exp_name        => "modem" ,
                rules           => <<EOF
 # this is a comment
-KERNEL=="ttyUSB0", NAME="visor"
+KERNEL=="ttyACM0", SYMLINK+="modem"
 
 EOF
        },
        {
                desc            => "Handle comment lines in config file with whitespace (and replace kernel name)",
                subsys          => "tty",
-               devpath         => "/class/tty/ttyUSB0",
-               exp_name        => "visor" ,
+               devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
+               exp_name        => "modem" ,
                rules           => <<EOF
  # this is a comment with whitespace before the comment 
-KERNEL=="ttyUSB0", NAME="visor"
+KERNEL=="ttyACM0", SYMLINK+="modem"
 
 EOF
        },
        {
                desc            => "Handle whitespace only lines (and replace kernel name)",
                subsys          => "tty",
-               devpath         => "/class/tty/ttyUSB0",
+               devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
                exp_name        => "whitespace" ,
                rules           => <<EOF
 
  
 
  # this is a comment with whitespace before the comment 
-KERNEL=="ttyUSB0", NAME="whitespace"
+KERNEL=="ttyACM0", SYMLINK+="whitespace"
 
  
 
@@ -174,1409 +202,1325 @@ EOF
        {
                desc            => "Handle empty lines in config file (and replace kernel name)",
                subsys          => "tty",
-               devpath         => "/class/tty/ttyUSB0",
-               exp_name        => "visor" ,
+               devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
+               exp_name        => "modem" ,
                rules           => <<EOF
 
-KERNEL=="ttyUSB0", NAME="visor"
+KERNEL=="ttyACM0", SYMLINK+="modem"
 
 EOF
        },
        {
                desc            => "Handle backslashed multi lines in config file (and replace kernel name)",
                subsys          => "tty",
-               devpath         => "/class/tty/ttyUSB0",
-               exp_name        => "visor" ,
+               devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
+               exp_name        => "modem" ,
                rules           => <<EOF
-KERNEL=="ttyUSB0", \\
-NAME="visor"
+KERNEL=="ttyACM0", \\
+SYMLINK+="modem"
 
 EOF
        },
        {
                desc            => "preserve backslashes, if they are not for a newline",
                subsys          => "tty",
-               devpath         => "/class/tty/ttyUSB0",
+               devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
                exp_name        => "aaa",
                rules           => <<EOF
-KERNEL=="ttyUSB0", PROGRAM=="/bin/echo -e \\101", RESULT=="A", NAME="aaa"
+KERNEL=="ttyACM0", PROGRAM=="/bin/echo -e \\101", RESULT=="A", SYMLINK+="aaa"
 EOF
        },
        {
                desc            => "Handle stupid backslashed multi lines in config file (and replace kernel name)",
                subsys          => "tty",
-               devpath         => "/class/tty/ttyUSB0",
-               exp_name        => "visor" ,
+               devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
+               exp_name        => "modem" ,
                rules           => <<EOF
 
 #
 \\
 
-\\\\
+\\
 
 #\\
 
-KERNEL=="ttyUSB0", \\
-       NAME="visor"
+KERNEL=="ttyACM0", \\
+       SYMLINK+="modem"
 
 EOF
        },
        {
                desc            => "subdirectory handling",
                subsys          => "tty",
-               devpath         => "/class/tty/ttyUSB0",
-               exp_name        => "sub/direct/ory/visor" ,
+               devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
+               exp_name        => "sub/direct/ory/modem" ,
                rules           => <<EOF
-KERNEL=="ttyUSB0", NAME="sub/direct/ory/visor"
+KERNEL=="ttyACM0", SYMLINK+="sub/direct/ory/modem"
 EOF
        },
        {
                desc            => "parent device name match of scsi partition",
                subsys          => "block",
-               devpath         => "/block/sda/sda3",
-               exp_name        => "first_disk3" ,
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5",
+               exp_name        => "first_disk5" ,
                rules           => <<EOF
-BUS=="scsi", ID=="0:0:0:0", NAME="first_disk%n"
+SUBSYSTEMS=="scsi", KERNELS=="0:0:0:0", SYMLINK+="first_disk%n"
 EOF
        },
        {
                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
-BUS=="scsi", ID=="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" ,
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5",
+               exp_name        => "Major:8:minor:5:kernelnumber:5:id:0:0:0:0" ,
                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", SYMLINK+="Major:%M:minor:%m:kernelnumber:%n:id:%b"
 EOF
        },
        {
                desc            => "import of shell-value file",
                subsys          => "block",
-               devpath         => "/block/sda",
-               exp_name        => "subdir/info/node" ,
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
+               exp_name        => "subdir/err/node" ,
                rules           => <<EOF
-BUS=="scsi", IMPORT{file}="udev-test.conf", NAME="subdir/%E{udev_log}/node"
-KERNEL=="ttyUSB0", NAME="visor"
+SUBSYSTEMS=="scsi", IMPORT{file}="udev-test.conf", SYMLINK+="subdir/%E{udev_log}/node"
+KERNEL=="ttyACM0", SYMLINK+="modem"
 EOF
        },
        {
                desc            => "import of shell-value returned from program",
                subsys          => "block",
-               devpath         => "/block/sda",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
                exp_name        => "node12345678",
                rules           => <<EOF
-BUS=="scsi", IMPORT="/bin/echo -e \' TEST_KEY=12345678  \\n  TEST_key2=98765 \'", NAME="node\$env{TEST_KEY}"
-KERNEL=="ttyUSB0", NAME="visor"
+SUBSYSTEMS=="scsi", IMPORT{program}="/bin/echo -e \' TEST_KEY=12345678\\n  TEST_key2=98765\'", SYMLINK+="node\$env{TEST_KEY}"
+KERNEL=="ttyACM0", SYMLINK+="modem"
 EOF
        },
        {
                desc            => "sustitution of sysfs value (%s{file})",
                subsys          => "block",
-               devpath         => "/block/sda",
-               exp_name        => "disk-IBM-ESXS-sda" ,
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
+               exp_name        => "disk-ATA-sda" ,
                rules           => <<EOF
-BUS=="scsi", SYSFS{vendor}=="IBM-ESXS", NAME="disk-%s{vendor}-%k"
-KERNEL=="ttyUSB0", NAME="visor"
+SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", SYMLINK+="disk-%s{vendor}-%k"
+KERNEL=="ttyACM0", SYMLINK+="modem"
 EOF
        },
        {
                desc            => "program result substitution",
                subsys          => "block",
-               devpath         => "/block/sda/sda3",
-               exp_name        => "special-device-3" ,
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5",
+               exp_name        => "special-device-5" ,
+               not_exp_name    => "not" ,
                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", PROGRAM=="/bin/echo -n special-device", RESULT=="-special-*", SYMLINK+="not"
+SUBSYSTEMS=="scsi", PROGRAM=="/bin/echo -n special-device", RESULT=="special-*", SYMLINK+="%c-%n"
 EOF
        },
        {
                desc            => "program result substitution (newline removal)",
                subsys          => "block",
-               devpath         => "/block/sda/sda3",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5",
                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", SYMLINK+="newline_removed"
 EOF
        },
        {
                desc            => "program result substitution",
                subsys          => "block",
-               devpath         => "/block/sda/sda3",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5",
                exp_name        => "test-0:0:0:0" ,
                rules           => <<EOF
-BUS=="scsi", PROGRAM=="/bin/echo -n test-%b", RESULT=="test-0:0*", NAME="%c"
-EOF
-       },
-       {
-               desc            => "program with escaped format char (tricky: callout returns format char!)",
-               subsys          => "block",
-               devpath         => "/block/sda/sda3",
-               exp_name        => "escape-3" ,
-               rules           => <<EOF
-BUS=="scsi", PROGRAM=="/bin/echo -n escape-%%n", KERNEL=="sda3", NAME="%c"
+SUBSYSTEMS=="scsi", PROGRAM=="/bin/echo -n test-%b", RESULT=="test-0:0*", SYMLINK+="%c"
 EOF
        },
        {
                desc            => "program with lots of arguments",
                subsys          => "block",
-               devpath         => "/block/sda/sda3",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5",
                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=="sda5", SYMLINK+="%c{7}"
 EOF
        },
        {
                desc            => "program with subshell",
                subsys          => "block",
-               devpath         => "/block/sda/sda3",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5",
                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=="sda5", SYMLINK+="%c{7}"
 EOF
        },
        {
                desc            => "program arguments combined with apostrophes",
                subsys          => "block",
-               devpath         => "/block/sda/sda3",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5",
                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=="sda5", SYMLINK+="%c{5}"
 EOF
        },
        {
                desc            => "characters before the %c{N} substitution",
                subsys          => "block",
-               devpath         => "/block/sda/sda3",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5",
                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=="sda5", SYMLINK+="my-%c{7}"
 EOF
        },
        {
                desc            => "substitute the second to last argument",
                subsys          => "block",
-               devpath         => "/block/sda/sda3",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5",
                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=="sda5", SYMLINK+="my-%c{6}"
 EOF
        },
        {
                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",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5",
+               exp_name        => "Major:8-minor:5-kernelnumber:5-id:0:0:0:0",
                rules           => <<EOF
-BUS=="scsi", ID=="0:0:0:0", NAME="Major:\$major-minor:\$minor-kernelnumber:\$number-id:\$id"
+SUBSYSTEMS=="scsi", KERNELS=="0:0:0:0", SYMLINK+="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",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5",
+               exp_name        => "Major:8-minor:5-kernelnumber:5-id:0:0:0:0",
                rules           => <<EOF
-BUS=="scsi", ID=="0:0:0:0", DEVPATH=="*/sda/*", NAME="Major:\$major-minor:%m-kernelnumber:\$number-id:\$id"
+SUBSYSTEMS=="scsi", KERNELS=="0:0:0:0", DEVPATH=="*/sda/*", SYMLINK+="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" ,
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5",
+               exp_name        => "850:0:0:05" ,
                rules           => <<EOF
-BUS=="scsi", ID=="0:0:0:0", DEVPATH=="*/sda/*", NAME="%M%m%b%n"
+SUBSYSTEMS=="scsi", KERNELS=="0:0:0:0", DEVPATH=="*/sda/*", SYMLINK+="%M%m%b%n"
 EOF
        },
        {
                desc            => "test substitution by variable name 4",
                subsys          => "block",
-               devpath         => "/block/sda/sda3",
-               exp_name        => "833" ,
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5",
+               exp_name        => "855" ,
                rules           => <<EOF
-BUS=="scsi", ID=="0:0:0:0", DEVPATH=="*/sda/*", NAME="\$major\$minor\$number"
+SUBSYSTEMS=="scsi", KERNELS=="0:0:0:0", DEVPATH=="*/sda/*", SYMLINK+="\$major\$minor\$number"
 EOF
        },
        {
                desc            => "test substitution by variable name 5",
                subsys          => "block",
-               devpath         => "/block/sda/sda3",
-               exp_name        => "8330:0:0:0" ,
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5",
+               exp_name        => "8550:0:0:0" ,
                rules           => <<EOF
-BUS=="scsi", ID=="0:0:0:0", DEVPATH=="*/sda/*", NAME="\$major%m%n\$id"
+SUBSYSTEMS=="scsi", KERNELS=="0:0:0:0", DEVPATH=="*/sda/*", SYMLINK+="\$major%m%n\$id"
 EOF
        },
        {
-               desc            => "non matching BUS for device with no parent",
+               desc            => "non matching SUBSYSTEMS for device with no parent",
                subsys          => "tty",
-               devpath         => "/class/tty/console",
+               devpath         => "/devices/virtual/tty/console",
                exp_name        => "TTY",
                rules           => <<EOF
-BUS=="scsi", PROGRAM=="/bin/echo -n foo", RESULT=="foo", NAME="foo"
-KERNEL=="console", NAME="TTY"
+SUBSYSTEMS=="scsi", PROGRAM=="/bin/echo -n foo", RESULT=="foo", SYMLINK+="foo"
+KERNEL=="console", SYMLINK+="TTY"
 EOF
        },
        {
-               desc            => "non matching BUS",
+               desc            => "non matching SUBSYSTEMS",
                subsys          => "tty",
-               devpath         => "/class/tty/console",
+               devpath         => "/devices/virtual/tty/console",
                exp_name        => "TTY" ,
                rules           => <<EOF
-BUS=="foo", SYSFS{dev}=="5:1", NAME="foo"
-KERNEL=="console", NAME="TTY"
+SUBSYSTEMS=="foo", ATTRS{dev}=="5:1", SYMLINK+="foo"
+KERNEL=="console", SYMLINK+="TTY"
 EOF
        },
        {
-               desc            => "SYSFS match",
+               desc            => "ATTRS match",
                subsys          => "tty",
-               devpath         => "/class/tty/console",
+               devpath         => "/devices/virtual/tty/console",
                exp_name        => "foo" ,
                rules           => <<EOF
-SYSFS{dev}=="5:1", NAME="foo"
-KERNEL=="console", NAME="TTY"
+KERNEL=="console", SYMLINK+="TTY"
+ATTRS{dev}=="5:1", SYMLINK+="foo"
 EOF
        },
        {
-               desc            => "program and bus type match",
-               subsys          => "block",
-               devpath         => "/block/sda",
-               exp_name        => "scsi-0:0:0:0" ,
+               desc            => "ATTR (empty file)",
+               subsys          => "tty",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
+               exp_name        => "empty" ,
                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"
+KERNEL=="sda", ATTR{test_empty_file}=="?*", SYMLINK+="something"
+KERNEL=="sda", ATTR{test_empty_file}!="", SYMLINK+="not-empty"
+KERNEL=="sda", ATTR{test_empty_file}=="", SYMLINK+="empty"
+KERNEL=="sda", ATTR{test_empty_file}!="?*", SYMLINK+="not-something"
 EOF
        },
        {
-               desc            => "create all possible partitions",
+               desc            => "ATTR (non-existent file)",
+               subsys          => "tty",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
+               exp_name        => "non-existent" ,
+               rules           => <<EOF
+KERNEL=="sda", ATTR{nofile}=="?*", SYMLINK+="something"
+KERNEL=="sda", ATTR{nofile}!="", SYMLINK+="not-empty"
+KERNEL=="sda", ATTR{nofile}=="", SYMLINK+="empty"
+KERNEL=="sda", ATTR{nofile}!="?*", SYMLINK+="not-something"
+KERNEL=="sda", TEST!="nofile", SYMLINK+="non-existent"
+KERNEL=="sda", SYMLINK+="wrong"
+EOF
+       },
+       {
+               desc            => "program and bus type match",
                subsys          => "block",
-               devpath         => "/block/sda",
-               exp_name        => "boot_disk15" ,
-               exp_majorminor  => "8:15",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
+               exp_name        => "scsi-0:0:0:0" ,
                rules           => <<EOF
-BUS=="scsi", SYSFS{vendor}=="IBM-ESXS", NAME{all_partitions}="boot_disk"
+SUBSYSTEMS=="usb", PROGRAM=="/bin/echo -n usb-%b", SYMLINK+="%c"
+SUBSYSTEMS=="scsi", PROGRAM=="/bin/echo -n scsi-%b", SYMLINK+="%c"
+SUBSYSTEMS=="foo", PROGRAM=="/bin/echo -n foo-%b", SYMLINK+="%c"
 EOF
        },
        {
                desc            => "sysfs parent hierarchy",
                subsys          => "tty",
-               devpath         => "/class/tty/ttyUSB0",
-               exp_name        => "visor" ,
+               devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
+               exp_name        => "modem" ,
                rules           => <<EOF
-SYSFS{idProduct}=="2008", NAME="visor"
+ATTRS{idProduct}=="007b", SYMLINK+="modem"
 EOF
        },
        {
                desc            => "name test with ! in the name",
                subsys          => "block",
-               devpath         => "/block/rd!c0d0",
-               exp_name        => "rd/c0d0" ,
+               devpath         => "/devices/virtual/block/fake!blockdev0",
+               exp_name        => "is/a/fake/blockdev0" ,
                rules           => <<EOF
-BUS=="scsi", NAME="%k"
-KERNEL=="ttyUSB0", NAME="visor"
+SUBSYSTEMS=="scsi", SYMLINK+="is/not/a/%k"
+SUBSYSTEM=="block", SYMLINK+="is/a/%k"
+KERNEL=="ttyACM0", SYMLINK+="modem"
 EOF
        },
        {
                desc            => "name test with ! in the name, but no matching rule",
                subsys          => "block",
-               devpath         => "/block/rd!c0d0",
-               exp_name        => "rd/c0d0" ,
+               devpath         => "/devices/virtual/block/fake!blockdev0",
+               exp_name        => "fake/blockdev0" ,
+               exp_rem_error   => "yes",
                rules           => <<EOF
-KERNEL=="ttyUSB0", NAME="visor"
+KERNEL=="ttyACM0", SYMLINK+="modem"
 EOF
        },
        {
-               desc            => "name test with ! in the name for a partition",
+               desc            => "KERNELS rule",
                subsys          => "block",
-               devpath         => "/block/cciss!c0d0/cciss!c0d0p1",
-               exp_name        => "cciss/c0d0p1" ,
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
+               exp_name        => "scsi-0:0:0:0",
                rules           => <<EOF
-BUS=="scsi", NAME="%k"
-KERNEL=="ttyUSB0", NAME="visor"
+SUBSYSTEMS=="usb", KERNELS=="0:0:0:0", SYMLINK+="not-scsi"
+SUBSYSTEMS=="scsi", KERNELS=="0:0:0:1", SYMLINK+="no-match"
+SUBSYSTEMS=="scsi", KERNELS==":0", SYMLINK+="short-id"
+SUBSYSTEMS=="scsi", KERNELS=="/0:0:0:0", SYMLINK+="no-match"
+SUBSYSTEMS=="scsi", KERNELS=="0:0:0:0", SYMLINK+="scsi-0:0:0:0"
 EOF
        },
        {
-               desc            => "ID rule",
+               desc            => "KERNELS wildcard all",
                subsys          => "block",
-               devpath         => "/block/sda",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/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=="scsi", KERNELS=="*:1", SYMLINK+="no-match"
+SUBSYSTEMS=="scsi", KERNELS=="*:0:1", SYMLINK+="no-match"
+SUBSYSTEMS=="scsi", KERNELS=="*:0:0:1", SYMLINK+="no-match"
+SUBSYSTEMS=="scsi", KERNEL=="0:0:0:0", SYMLINK+="before"
+SUBSYSTEMS=="scsi", KERNELS=="*", SYMLINK+="scsi-0:0:0:0"
 EOF
        },
        {
-               desc            => "ID wildcard all",
+               desc            => "KERNELS wildcard partial",
                subsys          => "block",
-               devpath         => "/block/sda",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/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=="0:0:0:0", SYMLINK+="before"
+SUBSYSTEMS=="scsi", KERNELS=="*:0", SYMLINK+="scsi-0:0:0:0"
 EOF
        },
        {
-               desc            => "ID wildcard partial",
+               desc            => "KERNELS wildcard partial 2",
                subsys          => "block",
-               devpath         => "/block/sda",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/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:0:0:0", SYMLINK+="before"
+SUBSYSTEMS=="scsi", KERNELS=="*:0:0:0", SYMLINK+="scsi-0:0:0:0"
 EOF
        },
        {
-               desc            => "ID wildcard partial 2",
+               desc            => "substitute attr with link target value (first match)",
                subsys          => "block",
-               devpath         => "/block/sda",
-               exp_name        => "scsi-0:0:0:0",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
+               exp_name        => "driver-is-sd",
                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", SYMLINK+="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",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
+               exp_name        => "driver-is-ahci",
+               rules           => <<EOF
+SUBSYSTEMS=="pci", SYMLINK+="driver-is-\$attr{driver}"
+EOF
+       },
+       {
+               desc            => "ignore ATTRS attribute whitespace",
+               subsys          => "block",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
                exp_name        => "ignored",
                rules           => <<EOF
-BUS=="scsi", SYSFS{whitespace_test}=="WHITE  SPACE", NAME="ignored"
+SUBSYSTEMS=="scsi", ATTRS{whitespace_test}=="WHITE  SPACE", SYMLINK+="ignored"
 EOF
        },
        {
-               desc            => "do not ignore SYSFS attribute whitespace",
+               desc            => "do not ignore ATTRS attribute whitespace",
                subsys          => "block",
-               devpath         => "/block/sda",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/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 ", SYMLINK+="wrong-to-ignore"
+SUBSYSTEMS=="scsi", ATTRS{whitespace_test}=="WHITE  SPACE   ", SYMLINK+="matched-with-space"
 EOF
        },
        {
                desc            => "permissions USER=bad GROUP=name",
                subsys          => "tty",
-               devpath         => "/class/tty/tty33",
+               devpath         => "/devices/virtual/tty/tty33",
                exp_name        => "tty33",
-               exp_perms       => "0:0:0660",
+               exp_perms       => "0:0:0600",
                rules           => <<EOF
-KERNEL=="tty33", NAME="tty33", OWNER="bad", GROUP="name"
+KERNEL=="tty33", SYMLINK+="tty33", OWNER="bad", GROUP="name"
 EOF
        },
        {
                desc            => "permissions OWNER=5000",
                subsys          => "block",
-               devpath         => "/block/sda",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
                exp_name        => "node",
-               exp_perms       => "5000::0660",
+               exp_perms       => "5000::0600",
                rules           => <<EOF
-BUS=="scsi", KERNEL=="sda", NAME="node", OWNER="5000"
+SUBSYSTEMS=="scsi", KERNEL=="sda", SYMLINK+="node", OWNER="5000"
 EOF
        },
        {
                desc            => "permissions GROUP=100",
                subsys          => "block",
-               devpath         => "/block/sda",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
                exp_name        => "node",
                exp_perms       => ":100:0660",
                rules           => <<EOF
-BUS=="scsi", KERNEL=="sda", NAME="node", GROUP="100"
+SUBSYSTEMS=="scsi", KERNEL=="sda", SYMLINK+="node", GROUP="100"
 EOF
        },
        {
                desc            => "textual user id",
                subsys          => "block",
-               devpath         => "/block/sda",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
                exp_name        => "node",
-               exp_perms       => "nobody::0660",
+               exp_perms       => "nobody::0600",
                rules           => <<EOF
-BUS=="scsi", KERNEL=="sda", NAME="node", OWNER="nobody"
+SUBSYSTEMS=="scsi", KERNEL=="sda", SYMLINK+="node", OWNER="nobody"
 EOF
        },
        {
                desc            => "textual group id",
                subsys          => "block",
-               devpath         => "/block/sda",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
                exp_name        => "node",
                exp_perms       => ":daemon:0660",
                rules           => <<EOF
-BUS=="scsi", KERNEL=="sda", NAME="node", GROUP="daemon"
+SUBSYSTEMS=="scsi", KERNEL=="sda", SYMLINK+="node", GROUP="daemon"
 EOF
        },
        {
                desc            => "textual user/group id",
                subsys          => "block",
-               devpath         => "/block/sda",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
                exp_name        => "node",
                exp_perms       => "root:mail:0660",
                rules           => <<EOF
-BUS=="scsi", KERNEL=="sda", NAME="node", OWNER="root", GROUP="mail"
+SUBSYSTEMS=="scsi", KERNEL=="sda", SYMLINK+="node", OWNER="root", GROUP="mail"
 EOF
        },
        {
                desc            => "permissions MODE=0777",
                subsys          => "block",
-               devpath         => "/block/sda",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
                exp_name        => "node",
                exp_perms       => "::0777",
                rules           => <<EOF
-BUS=="scsi", KERNEL=="sda", NAME="node", MODE="0777"
+SUBSYSTEMS=="scsi", KERNEL=="sda", SYMLINK+="node", MODE="0777"
 EOF
        },
        {
                desc            => "permissions OWNER=5000 GROUP=100 MODE=0777",
                subsys          => "block",
-               devpath         => "/block/sda",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
                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", SYMLINK+="node", OWNER="5000", GROUP="100", MODE="0777"
 EOF
        },
        {
                desc            => "permissions OWNER to 5000",
                subsys          => "tty",
-               devpath         => "/class/tty/ttyUSB0",
-               exp_name        => "ttyUSB0",
+               devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
+               exp_name        => "ttyACM0",
                exp_perms       => "5000::",
                rules           => <<EOF
-KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", OWNER="5000"
+KERNEL=="ttyACM[0-9]*", SYMLINK+="ttyACM%n", OWNER="5000"
 EOF
        },
        {
                desc            => "permissions GROUP to 100",
                subsys          => "tty",
-               devpath         => "/class/tty/ttyUSB0",
-               exp_name        => "ttyUSB0",
+               devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
+               exp_name        => "ttyACM0",
                exp_perms       => ":100:0660",
                rules           => <<EOF
-KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", GROUP="100"
+KERNEL=="ttyACM[0-9]*", SYMLINK+="ttyACM%n", GROUP="100"
 EOF
        },
        {
                desc            => "permissions MODE to 0060",
                subsys          => "tty",
-               devpath         => "/class/tty/ttyUSB0",
-               exp_name        => "ttyUSB0",
+               devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
+               exp_name        => "ttyACM0",
                exp_perms       => "::0060",
                rules           => <<EOF
-KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", MODE="0060"
+KERNEL=="ttyACM[0-9]*", SYMLINK+="ttyACM%n", MODE="0060"
 EOF
        },
        {
                desc            => "permissions OWNER, GROUP, MODE",
                subsys          => "tty",
-               devpath         => "/class/tty/ttyUSB0",
-               exp_name        => "ttyUSB0",
+               devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
+               exp_name        => "ttyACM0",
                exp_perms       => "5000:100:0777",
                rules           => <<EOF
-KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", OWNER="5000", GROUP="100", MODE="0777"
+KERNEL=="ttyACM[0-9]*", SYMLINK+="ttyACM%n", OWNER="5000", GROUP="100", MODE="0777"
 EOF
        },
        {
                desc            => "permissions only rule",
                subsys          => "tty",
-               devpath         => "/class/tty/ttyUSB0",
-               exp_name        => "ttyUSB0",
+               devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
+               exp_name        => "ttyACM0",
                exp_perms       => "5000:100:0777",
                rules           => <<EOF
-KERNEL=="ttyUSB[0-9]*", OWNER="5000", GROUP="100", MODE="0777"
+KERNEL=="ttyACM[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"
+KERNEL=="ttyACM[0-9]*", SYMLINK+="ttyACM%n"
 EOF
        },
        {
                desc            => "multiple permissions only rule",
                subsys          => "tty",
-               devpath         => "/class/tty/ttyUSB0",
-               exp_name        => "ttyUSB0",
+               devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
+               exp_name        => "ttyACM0",
                exp_perms       => "3000:4000:0777",
                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"
+KERNEL=="ttyACM[0-9]*", SYMLINK+="ttyACM%n"
 EOF
        },
        {
-               desc            => "permissions only rule with override at NAME rule",
+               desc            => "permissions only rule with override at SYMLINK+ rule",
                subsys          => "tty",
-               devpath         => "/class/tty/ttyUSB0",
-               exp_name        => "ttyUSB0",
+               devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
+               exp_name        => "ttyACM0",
                exp_perms       => "3000:8000:0777",
                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"
+KERNEL=="ttyACM[0-9]*", SYMLINK+="ttyACM%n", GROUP="8000"
 EOF
        },
        {
                desc            => "major/minor number test",
                subsys          => "block",
-               devpath         => "/block/sda",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
                exp_name        => "node",
                exp_majorminor  => "8:0",
                rules           => <<EOF
-BUS=="scsi", KERNEL=="sda", NAME="node"
-EOF
-       },
-       {
-               desc            => "big minor number test",
-               subsys          => "i2c-dev",
-               devpath         => "/class/i2c-dev/i2c-300",
-               exp_name        => "node",
-               exp_majorminor  => "89:300",
-               rules           => <<EOF
-KERNEL=="i2c-300", NAME="node"
+SUBSYSTEMS=="scsi", KERNEL=="sda", SYMLINK+="node"
 EOF
        },
        {
                desc            => "big major number test",
-               subsys          => "i2c-dev",
-               devpath         => "/class/i2c-dev/i2c-fake1",
+               subsys          => "misc",
+               devpath         => "/devices/virtual/misc/misc-fake1",
                exp_name        => "node",
                exp_majorminor  => "4095:1",
                rules           => <<EOF
-KERNEL=="i2c-fake1", NAME="node"
+KERNEL=="misc-fake1", SYMLINK+="node"
 EOF
        },
        {
                desc            => "big major and big minor number test",
-               subsys          => "i2c-dev",
-               devpath         => "/class/i2c-dev/i2c-fake2",
+               subsys          => "misc",
+               devpath         => "/devices/virtual/misc/misc-fake89999",
                exp_name        => "node",
-               exp_majorminor  => "4094:89999",
+               exp_majorminor  => "4095:89999",
                rules           => <<EOF
-KERNEL=="i2c-fake2", NAME="node"
+KERNEL=="misc-fake89999", SYMLINK+="node"
 EOF
        },
        {
                desc            => "multiple symlinks with format char",
                subsys          => "tty",
-               devpath         => "/class/tty/ttyUSB0",
-               exp_name        => "symlink2-ttyUSB0",
-               exp_target      => "ttyUSB0",
+               devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
+               exp_name        => "symlink2-ttyACM0",
                rules           => <<EOF
-KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="symlink1-%n symlink2-%k symlink3-%b"
+KERNEL=="ttyACM[0-9]*", 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",
+               devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
                exp_name        => "one",
                not_exp_name    => " ",
-               exp_target      => "ttyUSB0",
                rules           => <<EOF
-KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="  one     two        "
+KERNEL=="ttyACM[0-9]*", SYMLINK="  one     two        "
 EOF
        },
        {
                desc            => "symlink creation (same directory)",
                subsys          => "tty",
-               devpath         => "/class/tty/ttyUSB0",
-               exp_name        => "visor0",
-               exp_target      => "ttyUSB0",
+               devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
+               exp_name        => "modem0",
                rules           => <<EOF
-KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="visor%n"
+KERNEL=="ttyACM[0-9]*", SYMLINK+="ttyACM%n", SYMLINK="modem%n"
 EOF
        },
        {
                desc            => "symlink creation (relative link forward)",
                subsys          => "block",
-               devpath         => "/block/sda/sda2",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda6",
                exp_name        => "1/2/symlink" ,
                exp_target      => "a/b/node",
+               exp_rem_error   => "yes",
                rules           => <<EOF
-BUS=="scsi", SYSFS{vendor}=="IBM-ESXS", NAME="1/2/a/b/node", SYMLINK="1/2/symlink"
+SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", NAME="1/2/a/b/node", SYMLINK+="1/2/symlink"
 EOF
        },
        {
                desc            => "symlink creation (relative link back and forward)",
                subsys          => "block",
-               devpath         => "/block/sda/sda2",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda6",
                exp_name        => "1/2/c/d/symlink" ,
                exp_target      => "../../a/b/node",
+               exp_rem_error   => "yes",
                rules           => <<EOF
-BUS=="scsi", SYSFS{vendor}=="IBM-ESXS", NAME="1/2/a/b/node", SYMLINK="1/2/c/d/symlink"
+SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", NAME="1/2/a/b/node", SYMLINK+="1/2/c/d/symlink"
 EOF
        },
        {
                desc            => "multiple symlinks",
                subsys          => "tty",
-               devpath         => "/class/tty/ttyUSB0",
+               devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
                exp_name        => "second-0" ,
-               exp_target      => "visor" ,
                rules           => <<EOF
-KERNEL=="ttyUSB0", NAME="visor", SYMLINK="first-%n second-%n third-%n"
-EOF
-       },
-       {
-               desc            => "symlink only rule",
-               subsys          => "block",
-               devpath         => "/block/sda",
-               exp_name        => "symlink-only2",
-               exp_target      => "link",
-               rules           => <<EOF
-BUS=="scsi", KERNEL=="sda", SYMLINK+="symlink-only1"
-BUS=="scsi", KERNEL=="sda", SYMLINK+="symlink-only2"
-BUS=="scsi", KERNEL=="sda", NAME="link", SYMLINK+="symlink0"
+KERNEL=="ttyACM0", SYMLINK="first-%n second-%n third-%n"
 EOF
        },
        {
                desc            => "symlink name '.'",
                subsys          => "block",
-               devpath         => "/block/sda",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
                exp_name        => ".",
-               exp_target      => "link",
                exp_add_error   => "yes",
                exp_rem_error   => "yes",
                rules           => <<EOF
-BUS=="scsi", KERNEL=="sda", NAME="link", SYMLINK+="."
+SUBSYSTEMS=="scsi", KERNEL=="sda", SYMLINK+="."
 EOF
        },
        {
                desc            => "symlink node to itself",
                subsys          => "tty",
-               devpath         => "/class/tty/tty0",
+               devpath         => "/devices/virtual/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", SYMLINK+="tty0"
 EOF
        },
        {
                desc            => "symlink %n substitution",
                subsys          => "tty",
-               devpath         => "/class/tty/ttyUSB0",
+               devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
                exp_name        => "symlink0",
-               exp_target      => "ttyUSB0",
                rules           => <<EOF
-KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK+="symlink%n"
+KERNEL=="ttyACM[0-9]*", SYMLINK+="ttyACM%n", SYMLINK+="symlink%n"
 EOF
        },
        {
                desc            => "symlink %k substitution",
                subsys          => "tty",
-               devpath         => "/class/tty/ttyUSB0",
-               exp_name        => "symlink-ttyUSB0",
-               exp_target      => "ttyUSB0",
+               devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
+               exp_name        => "symlink-ttyACM0",
                rules           => <<EOF
-KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK+="symlink-%k"
+KERNEL=="ttyACM[0-9]*", SYMLINK+="ttyACM%n", SYMLINK+="symlink-%k"
 EOF
        },
        {
                desc            => "symlink %M:%m substitution",
                subsys          => "tty",
-               devpath         => "/class/tty/ttyUSB0",
-               exp_name        => "major-188:0",
-               exp_target      => "ttyUSB0",
+               devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
+               exp_name        => "major-166:0",
                rules           => <<EOF
-KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK+="major-%M:%m"
+KERNEL=="ttyACM[0-9]*", SYMLINK+="ttyACM%n", SYMLINK+="major-%M:%m"
 EOF
        },
        {
                desc            => "symlink %b substitution",
                subsys          => "block",
-               devpath         => "/block/sda",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
                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
        },
        {
                desc            => "symlink %c substitution",
                subsys          => "tty",
-               devpath         => "/class/tty/ttyUSB0",
+               devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
                exp_name        => "test",
-               exp_target      => "ttyUSB0",
                rules           => <<EOF
-KERNEL=="ttyUSB[0-9]*", PROGRAM=="/bin/echo test" NAME="ttyUSB%n", SYMLINK+="%c"
+KERNEL=="ttyACM[0-9]*", PROGRAM=="/bin/echo test", SYMLINK+="%c"
 EOF
        },
        {
                desc            => "symlink %c{N} substitution",
                subsys          => "tty",
-               devpath         => "/class/tty/ttyUSB0",
+               devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
                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=="ttyACM[0-9]*", PROGRAM=="/bin/echo symlink test this", SYMLINK+="%c{2}"
 EOF
        },
        {
                desc            => "symlink %c{N+} substitution",
                subsys          => "tty",
-               devpath         => "/class/tty/ttyUSB0",
+               devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
                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=="ttyACM[0-9]*", PROGRAM=="/bin/echo symlink test this", SYMLINK+="%c{2+}"
 EOF
        },
        {
                desc            => "symlink only rule with %c{N+}",
                subsys          => "block",
-               devpath         => "/block/sda",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
                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+}"
 EOF
        },
        {
                desc            => "symlink %s{filename} substitution",
                subsys          => "tty",
-               devpath         => "/class/tty/ttyUSB0",
-               exp_name        => "188:0",
-               exp_target      => "ttyUSB0",
-               rules           => <<EOF
-KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK+="%s{dev}"
-EOF
-       },
-       {
-               desc            => "symlink %Ns{filename} substitution",
-               subsys          => "tty",
-               devpath         => "/class/tty/ttyUSB0",
-               exp_name        => "188",
-               exp_target      => "ttyUSB0",
-               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",
+               devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
+               exp_name        => "166:0",
                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=="ttyACM[0-9]*", SYMLINK+="%s{dev}"
 EOF
        },
        {
                desc            => "program result substitution (numbered part of)",
                subsys          => "block",
-               devpath         => "/block/sda/sda3",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5",
                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 *", SYMLINK+="%c{2} %c{3}"
 EOF
        },
        {
                desc            => "program result substitution (numbered part of+)",
                subsys          => "block",
-               devpath         => "/block/sda/sda3",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5",
                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"
-EOF
-       },
-       {
-               desc            => "ignore rule test",
-               subsys          => "block",
-               devpath         => "/block/sda",
-               exp_name        => "nothing",
-               not_exp_name    => "node",
-               exp_add_error   => "yes",
-               rules           => <<EOF
-BUS=="scsi", KERNEL=="sda", NAME="node", OPTIONS="ignore"
-EOF
-       },
-       {
-               desc            => "all_partitions, option-only rule",
-               subsys          => "block",
-               devpath         => "/block/sda",
-               exp_name        => "node6",
-               rules           => <<EOF
-SUBSYSTEM=="block", OPTIONS="all_partitions"
-BUS=="scsi", KERNEL=="sda", NAME="node"
-EOF
-       },
-       {
-               desc            => "all_partitions, option-only rule (fail on partition)",
-               subsys          => "block",
-               devpath         => "/block/sda/sda1",
-               exp_name        => "node6",
-               exp_add_error   => "yes",
-               rules           => <<EOF
-SUBSYSTEM=="block", OPTIONS="all_partitions"
-BUS=="scsi", KERNEL=="sda", NAME="node"
-EOF
-       },
-       {
-               desc            => "ignore remove event test",
-               subsys          => "block",
-               devpath         => "/block/sda",
-               exp_name        => "node",
-               exp_rem_error   => "yes",
-               rules           => <<EOF
-BUS=="scsi", KERNEL=="sda", NAME="node", OPTIONS="ignore_remove"
-EOF
-       },
-       {
-               desc            => "ignore remove event test (with all partitions)",
-               subsys          => "block",
-               devpath         => "/block/sda",
-               exp_name        => "node14",
-               exp_rem_error   => "yes",
-               option          => "clean",
-               rules           => <<EOF
-BUS=="scsi", KERNEL=="sda", NAME="node", OPTIONS="ignore_remove, all_partitions"
+SUBSYSTEMS=="scsi", PROGRAM=="/bin/echo -n node link1 link2 link3 link4", RESULT=="node *", SYMLINK+="%c{2+}"
 EOF
        },
        {
                desc            => "SUBSYSTEM match test",
                subsys          => "block",
-               devpath         => "/block/sda",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/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", SYMLINK+="should_not_match", SUBSYSTEM=="vc"
+SUBSYSTEMS=="scsi", KERNEL=="sda", SYMLINK+="node", SUBSYSTEM=="block"
+SUBSYSTEMS=="scsi", KERNEL=="sda", SYMLINK+="should_not_match2", SUBSYSTEM=="vc"
 EOF
        },
        {
-               desc            => "DRIVER match test",
+               desc            => "DRIVERS match test",
                subsys          => "block",
-               devpath         => "/block/sda",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/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", SYMLINK+="should_not_match", DRIVERS=="sd-wrong"
+SUBSYSTEMS=="scsi", KERNEL=="sda", SYMLINK+="node", DRIVERS=="sd"
 EOF
        },
        {
                desc            => "temporary node creation test",
                subsys          => "block",
-               devpath         => "/block/sda",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
                exp_name        => "node",
                rules           => <<EOF
-BUS=="scsi", KERNEL=="sda", PROGRAM=="/usr/bin/test -b %N" NAME="node"
-EOF
-       },
-       {
-               desc            => "devpath substitution test",
-               subsys          => "block",
-               devpath         => "/block/sda",
-               exp_name        => "sda",
-               rules           => <<EOF
-BUS=="scsi", KERNEL=="sda", PROGRAM=="/bin/echo %p", RESULT=="/block/sda" NAME="%k"
+SUBSYSTEMS=="scsi", KERNEL=="sda", PROGRAM=="/usr/bin/test -b %N" SYMLINK+="node"
 EOF
        },
        {
                desc            => "parent node name substitution test sequence 1/2 (keep)",
                subsys          => "block",
-               devpath         => "/block/sda",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
                exp_name        => "main_device",
                option          => "keep",
+               exp_rem_error   => "yes",
                rules           => <<EOF
-BUS=="scsi", KERNEL=="sda", NAME="main_device"
+SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="main_device"
 EOF
        },
        {
                desc            => "parent node name substitution test sequence 2/2 (clean)",
                subsys          => "block",
-               devpath         => "/block/sda/sda1",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1",
                exp_name        => "main_device-part-1",
                option          => "clean",
                rules           => <<EOF
-BUS=="scsi", KERNEL=="sda1", NAME="%P-part-1"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", SYMLINK+="%P-part-1"
 EOF
        },
        {
                desc            => "udev_root substitution",
                subsys          => "block",
-               devpath         => "/block/sda/sda1",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1",
                exp_name        => "start-udev-root-end",
                rules           => <<EOF
-BUS=="scsi", KERNEL=="sda1", NAME="start-%r-end"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", SYMLINK+="start-%r-end"
 EOF
        },
        {
                desc            => "last_rule option",
                subsys          => "block",
-               devpath         => "/block/sda/sda1",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/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", SYMLINK+="very-last"
 EOF
        },
        {
                desc            => "negation KERNEL!=",
                subsys          => "block",
-               devpath         => "/block/sda/sda1",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/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", SYMLINK+="matches-but-is-negated"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", SYMLINK+="before"
+SUBSYSTEMS=="scsi", KERNEL!="xsda1", SYMLINK+="match"
 EOF
        },
        {
                desc            => "negation SUBSYSTEM!=",
                subsys          => "block",
-               devpath         => "/block/sda/sda1",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/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", SYMLINK+="matches-but-is-negated"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", SYMLINK+="before"
+SUBSYSTEMS=="scsi", SUBSYSTEM!="anything", SYMLINK+="not-anything"
 EOF
        },
        {
                desc            => "negation PROGRAM!= exit code",
                subsys          => "block",
-               devpath         => "/block/sda/sda1",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1",
                exp_name        => "nonzero-program",
                rules           => <<EOF
-KERNEL=="sda1", PROGRAM!="/bin/false", NAME="nonzero-program"
-BUS=="scsi", KERNEL=="sda1", NAME="wrong"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", SYMLINK+="before"
+KERNEL=="sda1", PROGRAM!="/bin/false", SYMLINK+="nonzero-program"
 EOF
        },
        {
                desc            => "test for whitespace between the operator",
                subsys          => "block",
-               devpath         => "/block/sda/sda1",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1",
                exp_name        => "true",
                rules           => <<EOF
-KERNEL   ==   "sda1"     ,    NAME   =    "true"
-BUS=="scsi", KERNEL=="sda1", NAME="wrong"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", SYMLINK+="before"
+KERNEL   ==   "sda1"     ,    SYMLINK+   =    "true"
 EOF
        },
        {
                desc            => "ENV{} test",
                subsys          => "block",
-               devpath         => "/block/sda/sda1",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/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"
+ENV{ENV_KEY_TEST}="test"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ENV_KEY_TEST}=="go", SYMLINK+="wrong"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ENV_KEY_TEST}=="test", SYMLINK+="true"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ENV_KEY_TEST}=="bad", SYMLINK+="bad"
 EOF
        },
        {
                desc            => "ENV{} test",
                subsys          => "block",
-               devpath         => "/block/sda/sda1",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/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"
+ENV{ENV_KEY_TEST}="test"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ENV_KEY_TEST}=="go", SYMLINK+="wrong"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ENV_KEY_TEST}=="yes", ENV{ACTION}=="add", ENV{DEVPATH}=="*/block/sda/sdax1", SYMLINK+="no"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ENV_KEY_TEST}=="test", ENV{ACTION}=="add", ENV{DEVPATH}=="*/block/sda/sda1", SYMLINK+="true"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ENV_KEY_TEST}=="bad", SYMLINK+="bad"
 EOF
        },
        {
                desc            => "ENV{} test (assign)",
                subsys          => "block",
-               devpath         => "/block/sda/sda1",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1",
                exp_name        => "true",
                rules           => <<EOF
-BUS=="scsi", KERNEL=="sda1", ENV{ASSIGN}="true"
-BUS=="scsi", KERNEL=="sda1", ENV{ASSIGN}=="yes", NAME="no"
-BUS=="scsi", KERNEL=="sda1", ENV{ASSIGN}=="true", NAME="true"
-BUS=="scsi", KERNEL=="sda1", NAME="bad"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ASSIGN}="true"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ASSIGN}=="yes", SYMLINK+="no"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", SYMLINK+="before"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ASSIGN}=="true", SYMLINK+="true"
+EOF
+       },
+       {
+               desc            => "ENV{} test (assign 2 times)",
+               subsys          => "block",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/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", SYMLINK+="before"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ASSIGN}=="yes", SYMLINK+="no"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ASSIGN}=="absolutely-true", SYMLINK+="true"
 EOF
        },
        {
                desc            => "ENV{} test (assign2)",
                subsys          => "block",
-               devpath         => "/block/sda/sda1",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/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"
+ENV{MAINDEVICE}=="true", SYMLINK+="disk"
+SUBSYSTEM=="block", SYMLINK+="before"
+ENV{PARTITION}=="true", SYMLINK+="part"
 EOF
        },
        {
                desc            => "untrusted string sanitize",
                subsys          => "block",
-               devpath         => "/block/sda/sda1",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/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_", SYMLINK+="sane"
 EOF
        },
        {
                desc            => "untrusted string sanitize (don't replace utf8)",
                subsys          => "block",
-               devpath         => "/block/sda/sda1",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1",
                exp_name        => "uber",
                rules           => <<EOF
-BUS=="scsi", KERNEL=="sda1", PROGRAM=="/bin/echo -e \\xc3\\xbcber" RESULT=="\xc3\xbcber", NAME="uber"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", PROGRAM=="/bin/echo -e \\xc3\\xbcber" RESULT=="\xc3\xbcber", SYMLINK+="uber"
 EOF
        },
        {
                desc            => "untrusted string sanitize (replace invalid utf8)",
                subsys          => "block",
-               devpath         => "/block/sda/sda1",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1",
                exp_name        => "replaced",
                rules           => <<EOF
-BUS=="scsi", KERNEL=="sda1", PROGRAM=="/bin/echo -e \\xef\\xe8garbage", RESULT=="__garbage", NAME="replaced"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", PROGRAM=="/bin/echo -e \\xef\\xe8garbage", RESULT=="__garbage", SYMLINK+="replaced"
 EOF
        },
        {
-               desc            => "read sysfs value from device down in the chain",
+               desc            => "read sysfs value from parent device",
                subsys          => "block",
-               devpath         => "/class/tty/ttyUSB0",
-               exp_name        => "serial-0000:00:09.0",
+               devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
+               exp_name        => "serial-354172020305000",
                rules           => <<EOF
-KERNEL=="ttyUSB*", NAME="serial-%s{serial}"
+KERNEL=="ttyACM*", ATTRS{serial}=="?*", SYMLINK+="serial-%s{serial}"
 EOF
        },
        {
                desc            => "match against empty key string",
                subsys          => "block",
-               devpath         => "/block/sda",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/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}!="", SYMLINK+="not-1-ok"
+KERNEL=="sda", ATTRS{nothing}=="", SYMLINK+="not-2-ok"
+KERNEL=="sda", ATTRS{vendor}!="", SYMLINK+="ok"
+KERNEL=="sda", ATTRS{vendor}=="", SYMLINK+="not-3-ok"
 EOF
        },
        {
                desc            => "check ACTION value",
                subsys          => "block",
-               devpath         => "/block/sda",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
                exp_name        => "ok",
                rules           => <<EOF
-ACTION=="unknown", KERNEL=="sda", NAME="unknown-not-ok"
-ACTION=="add", KERNEL=="sda", NAME="ok"
-EOF
-       },
-       {
-               desc            => "apply NAME only once",
-               subsys          => "block",
-               devpath         => "/block/sda",
-               exp_name        => "link",
-               exp_target      => "ok",
-               rules           => <<EOF
-KERNEL=="sda", NAME="ok"
-KERNEL=="sda", NAME="not-ok"
-KERNEL=="sda", SYMLINK+="link"
-EOF
-       },
-       {
-               desc            => "test RUN key",
-               subsys          => "block",
-               devpath         => "/block/sda",
-               exp_name        => "testsymlink",
-               exp_target      => "ok",
-               exp_rem_error   => "yes",
-               option          => "clean",
-               rules           => <<EOF
-KERNEL=="sda", NAME="ok", RUN+="/bin/ln -s ok %r/testsymlink"
-KERNEL=="sda", NAME="not-ok"
-EOF
-       },
-       {
-               desc            => "test RUN key and DEVNAME",
-               subsys          => "block",
-               devpath         => "/block/sda",
-               exp_name        => "testsymlink",
-               exp_target      => "ok",
-               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="not-ok"
+ACTION=="unknown", KERNEL=="sda", SYMLINK+="unknown-not-ok"
+ACTION=="add", KERNEL=="sda", SYMLINK+="ok"
 EOF
        },
        {
                desc            => "test RUN key remove",
                subsys          => "block",
-               devpath         => "/block/sda",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
                exp_name        => "testsymlink2",
                exp_target      => "ok2",
                rules           => <<EOF
 KERNEL=="sda", NAME="ok2", RUN+="/bin/ln -s ok2 %r/testsymlink2"
 KERNEL=="sda", ACTION=="remove", RUN+="/bin/rm -f %r/testsymlink2"
-KERNEL=="sda", NAME="not-ok2"
 EOF
        },
        {
                desc            => "final assignment",
                subsys          => "block",
-               devpath         => "/block/sda",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
                exp_name        => "ok",
-               exp_perms       => "root:nobody:0640",
+               exp_perms       => "root:tty:0640",
                rules           => <<EOF
-KERNEL=="sda", GROUP:="nobody"
-KERNEL=="sda", GROUP="not-ok", MODE="0640", NAME="ok"
+KERNEL=="sda", GROUP:="tty"
+KERNEL=="sda", GROUP="not-ok", MODE="0640", SYMLINK+="ok"
 EOF
        },
        {
-               desc            => "final assignment",
+               desc            => "final assignment 2",
                subsys          => "block",
-               devpath         => "/block/sda",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
                exp_name        => "ok",
-               exp_perms       => "root:nobody:0640",
+               exp_perms       => "root:tty:0640",
                rules           => <<EOF
-KERNEL=="sda", GROUP:="nobody"
+KERNEL=="sda", GROUP:="tty"
 SUBSYSTEM=="block", MODE:="640"
-KERNEL=="sda", GROUP="not-ok", MODE="0666", NAME="ok"
+KERNEL=="sda", GROUP="not-ok", MODE="0666", SYMLINK+="ok"
 EOF
        },
        {
                desc            => "env substitution",
                subsys          => "block",
-               devpath         => "/block/sda",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
                exp_name        => "node-add-me",
                rules           => <<EOF
-KERNEL=="sda", MODE="0666", NAME="node-\$env{ACTION}-me"
+KERNEL=="sda", MODE="0666", SYMLINK+="node-\$env{ACTION}-me"
 EOF
        },
        {
                desc            => "reset list to current value",
                subsys          => "tty",
-               devpath         => "/class/tty/ttyUSB0",
+               devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
                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"
+KERNEL=="ttyACM[0-9]*", SYMLINK+="one"
+KERNEL=="ttyACM[0-9]*", SYMLINK+="two"
+KERNEL=="ttyACM[0-9]*", SYMLINK="three"
 EOF
        },
        {
-               desc            => "test empty NAME",
+               desc            => "test empty SYMLINK+ (empty override)",
                subsys          => "tty",
-               devpath         => "/class/tty/ttyUSB0",
-               exp_name        => "node",
+               devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
+               exp_name        => "right",
                not_exp_name    => "wrong",
-               exp_add_error   => "yes",
                rules           => <<EOF
-KERNEL=="ttyUSB[0-9]*", NAME=""
-KERNEL=="ttyUSB[0-9]*", NAME="wrong"
+KERNEL=="ttyACM[0-9]*", SYMLINK+="wrong"
+KERNEL=="ttyACM[0-9]*", SYMLINK=""
+KERNEL=="ttyACM[0-9]*", SYMLINK+="right"
 EOF
        },
        {
-               desc            => "test empty NAME 2",
+               desc            => "test multi matches",
                subsys          => "tty",
-               devpath         => "/class/tty/ttyUSB0",
+               devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
                exp_name        => "right",
                rules           => <<EOF
-KERNEL=="ttyUSB[0-9]*", NAME="right"
-KERNEL=="ttyUSB[0-9]*", NAME=""
-KERNEL=="ttyUSB[0-9]*", NAME="wrong"
+KERNEL=="ttyACM*", SYMLINK+="before"
+KERNEL=="ttyACM*|nothing", SYMLINK+="right"
 EOF
        },
        {
-               desc            => "test multi matches",
+               desc            => "test multi matches 2",
                subsys          => "tty",
-               devpath         => "/class/tty/ttyUSB0",
+               devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
                exp_name        => "right",
                rules           => <<EOF
-KERNEL=="ttyUSB*|nothing", NAME="right"
-KERNEL=="ttyUSB*", NAME="wrong"
+KERNEL=="dontknow*|*nothing", SYMLINK+="nomatch"
+KERNEL=="ttyACM*", SYMLINK+="before"
+KERNEL=="dontknow*|ttyACM*|nothing*", SYMLINK+="right"
 EOF
        },
        {
-               desc            => "test multi matches 2",
+               desc            => "test multi matches 3",
                subsys          => "tty",
-               devpath         => "/class/tty/ttyUSB0",
+               devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
                exp_name        => "right",
                rules           => <<EOF
-KERNEL=="dontknow*|*nothing", NAME="nomatch"
-KERNEL=="dontknow*|ttyUSB*|nothing*", NAME="right"
-KERNEL=="ttyUSB*", NAME="wrong"
+KERNEL=="dontknow|nothing", SYMLINK+="nomatch"
+KERNEL=="dontknow|ttyACM0a|nothing|attyACM0", SYMLINK+="wrong1"
+KERNEL=="X|attyACM0|dontknow|ttyACM0a|nothing|attyACM0", SYMLINK+="wrong2"
+KERNEL=="dontknow|ttyACM0|nothing", SYMLINK+="right"
+EOF
+       },
+       {
+               desc            => "test multi matches 4",
+               subsys          => "tty",
+               devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
+               exp_name        => "right",
+               rules           => <<EOF
+KERNEL=="dontknow|nothing", SYMLINK+="nomatch"
+KERNEL=="dontknow|ttyACM0a|nothing|attyACM0", SYMLINK+="wrong1"
+KERNEL=="X|attyACM0|dontknow|ttyACM0a|nothing|attyACM0", SYMLINK+="wrong2"
+KERNEL=="all|dontknow|ttyACM0", SYMLINK+="right"
+KERNEL=="ttyACM0a|nothing", SYMLINK+="wrong3"
 EOF
        },
        {
                desc            => "IMPORT parent test sequence 1/2 (keep)",
                subsys          => "block",
-               devpath         => "/block/sda",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/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"
+KERNEL=="sda", IMPORT{program}="/bin/echo -e \'PARENT_KEY=parent_right\\nWRONG_PARENT_KEY=parent_wrong'"
+KERNEL=="sda", SYMLINK+="parent"
 EOF
        },
        {
                desc            => "IMPORT parent test sequence 2/2 (keep)",
                subsys          => "block",
-               devpath         => "/block/sda/sda1",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/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}"
+KERNEL=="sda1", IMPORT{parent}="PARENT*", SYMLINK+="parentenv-\$env{PARENT_KEY}\$env{WRONG_PARENT_KEY}"
 EOF
        },
        {
                desc            => "GOTO test",
                subsys          => "block",
-               devpath         => "/block/sda/sda1",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/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"
+KERNEL=="sda1", SYMLINK+="wrong"
+KERNEL=="sda1", GOTO="BAD"
+KERNEL=="sda1", SYMLINK+="", LABEL="NO"
+KERNEL=="sda1", SYMLINK+="right", LABEL="TEST", GOTO="end"
+KERNEL=="sda1", SYMLINK+="wrong2", LABEL="BAD"
+LABEL="end"
 EOF
        },
        {
-               desc            => "NAME compare test",
+               desc            => "GOTO label does not exist",
                subsys          => "block",
-               devpath         => "/block/sda/sda1",
-               exp_name        => "link",
-               exp_target      => "node",
-               not_exp_name    => "wronglink",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1",
+               exp_name        => "right",
                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"
+KERNEL=="sda1", GOTO="does-not-exist"
+KERNEL=="sda1", SYMLINK+="right",
+LABEL="exists"
 EOF
        },
        {
-               desc            => "NAME compare test 2",
+               desc            => "SYMLINK+ compare test",
                subsys          => "block",
-               devpath         => "/block/sda/sda1",
-               exp_name        => "link2",
-               exp_target      => "sda1",
-               not_exp_name    => "link",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1",
+               exp_name        => "right",
+               not_exp_name    => "wrong",
                rules           => <<EOF
-KERNEL=="sda1", NAME=="?*", SYMLINK+="link"
-KERNEL=="sda1", NAME!="?*", SYMLINK+="link2"
+KERNEL=="sda1", SYMLINK+="link"
+KERNEL=="sda1", SYMLINK=="link*", SYMLINK+="right"
+KERNEL=="sda1", SYMLINK=="nolink*", SYMLINK+="wrong"
 EOF
        },
        {
                desc            => "invalid key operation",
                subsys          => "block",
-               devpath         => "/block/sda/sda1",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1",
+               exp_name        => "yes",
+               rules           => <<EOF
+KERNEL="sda1", SYMLINK+="no"
+KERNEL=="sda1", SYMLINK+="yes"
+EOF
+       },
+       {
+               desc            => "operator chars in attribute",
+               subsys          => "block",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
+               exp_name        => "yes",
+               rules           => <<EOF
+KERNEL=="sda", ATTR{test:colon+plus}=="?*", SYMLINK+="yes"
+EOF
+       },
+       {
+               desc            => "overlong comment line",
+               subsys          => "block",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1",
+               exp_name        => "yes",
+               rules           => <<EOF
+# 012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
+   # 012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
+KERNEL=="sda1", SYMLINK+=="no"
+KERNEL=="sda1", SYMLINK+="yes"
+EOF
+       },
+       {
+               desc            => "magic subsys/kernel lookup",
+               subsys          => "block",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
+               exp_name        => "00:16:41:e2:8d:ff",
+               rules           => <<EOF
+KERNEL=="sda", SYMLINK+="\$attr{[net/eth0]address}"
+EOF
+       },
+       {
+               desc            => "TEST absolute path",
+               subsys          => "block",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
+               exp_name        => "there",
+               rules           => <<EOF
+TEST=="/etc/hosts", SYMLINK+="there"
+TEST!="/etc/hosts", SYMLINK+="notthere"
+EOF
+       },
+       {
+               desc            => "TEST subsys/kernel lookup",
+               subsys          => "block",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
                exp_name        => "yes",
                rules           => <<EOF
-KERNEL="sda1", NAME=="no"
-KERNEL=="sda1", NAME="yes"
+KERNEL=="sda", TEST=="[net/eth0]", SYMLINK+="yes"
+EOF
+       },
+       {
+               desc            => "TEST relative path",
+               subsys          => "block",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
+               exp_name        => "relative",
+               rules           => <<EOF
+KERNEL=="sda", TEST=="size", SYMLINK+="relative"
+EOF
+       },
+       {
+               desc            => "TEST wildcard substitution (find queue/nr_requests)",
+               subsys          => "block",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
+               exp_name        => "found-subdir",
+               rules           => <<EOF
+KERNEL=="sda", TEST=="*/nr_requests", SYMLINK+="found-subdir"
+EOF
+       },
+       {
+               desc            => "TEST MODE=0000",
+               subsys          => "block",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
+               exp_name        => "sda",
+               exp_perms       => "0:0:0000",
+               exp_rem_error   => "yes",
+               rules           => <<EOF
+KERNEL=="sda", MODE="0000"
+EOF
+       },
+       {
+               desc            => "TEST PROGRAM feeds OWNER, GROUP, MODE",
+               subsys          => "block",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
+               exp_name        => "sda",
+               exp_perms       => "5000:100:0400",
+               exp_rem_error   => "yes",
+               rules           => <<EOF
+KERNEL=="sda", MODE="666"
+KERNEL=="sda", PROGRAM=="/bin/echo 5000 100 0400", OWNER="%c{1}", GROUP="%c{2}", MODE="%c{3}"
+EOF
+       },
+       {
+               desc            => "TEST PROGRAM feeds MODE with overflow",
+               subsys          => "block",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
+               exp_name        => "sda",
+               exp_perms       => "0:0:0440",
+               exp_rem_error   => "yes",
+               rules           => <<EOF
+KERNEL=="sda", MODE="440"
+KERNEL=="sda", PROGRAM=="/bin/echo 0 0 0400letsdoabuffferoverflow0123456789012345789012345678901234567890", OWNER="%c{1}", GROUP="%c{2}", MODE="%c{3}"
+EOF
+       },
+       {
+               desc            => "magic [subsys/sysname] attribute substitution",
+               subsys          => "block",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
+               exp_name        => "sda-8741C4G-end",
+               exp_perms       => "0:0:0600",
+               rules           => <<EOF
+KERNEL=="sda", PROGRAM="/bin/true create-envp"
+KERNEL=="sda", ENV{TESTENV}="change-envp"
+KERNEL=="sda", SYMLINK+="%k-%s{[dmi/id]product_name}-end", RUN+="socket:@/org/kernel/udev/monitor"
+EOF
+       },
+       {
+               desc            => "builtin path_id",
+               subsys          => "block",
+               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
+               exp_name        => "disk/by-path/pci-0000:00:1f.2-scsi-0:0:0:0",
+               rules           => <<EOF
+KERNEL=="sda", IMPORT{builtin}="path_id"
+KERNEL=="sda", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/\$env{ID_PATH}"
 EOF
        },
 );
 
 # set env
-$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) = @_;
@@ -1589,7 +1533,12 @@ sub udev {
        close CONF;
 
        $ENV{ACTION} = $action;
-       system("$udev_bin $subsys");
+       $ENV{SUBSYSTEM} = $subsys;
+       if ($valgrind > 0) {
+               system("$udev_bin_valgrind");
+       } else {
+               system("$udev_bin");
+       }
 }
 
 my $error = 0;
@@ -1628,6 +1577,7 @@ sub permissions_test {
                printf "  created permissions are : %i:%i:%#o\n", $uid, $gid, $mode & 07777;
                print "permissions: error\n";
                $error++;
+               sleep(1);
        }
 }
 
@@ -1652,6 +1602,7 @@ sub major_minor_test {
                printf "  created major:minor is : %i:%i\n", $major, $minor;
                print "major:minor: error\n";
                $error++;
+               sleep(1);
        }
 }
 
@@ -1672,6 +1623,7 @@ sub symlink_test {
                        } else {
                                print "\n";
                                $error++;
+                               sleep(1);
                        }
                }
        } else {
@@ -1682,36 +1634,48 @@ sub symlink_test {
                } else {
                        print "\n";
                        $error++;
+                       sleep(1);
                }
        }
 }
 
+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 ($rules, $number) = @_;
 
        print "TEST $number: $rules->{desc}\n";
 
        if ($rules->{exp_target}) {
-               print "device \'$rules->{devpath}\' expecting symlink '$rules->{exp_name}' to node \'$rules->{exp_target}\'\n";
+               print "device \'$rules->{devpath}\' expecting link '$rules->{exp_name}' to node \'$rules->{exp_target}\'\n";
        } else {
-               print "device \'$rules->{devpath}\' expecting node \'$rules->{exp_name}\'\n";
+               print "device \'$rules->{devpath}\' expecting node/link \'$rules->{exp_name}\'\n";
        }
 
 
        udev("add", $rules->{subsys}, $rules->{devpath}, \$rules->{rules});
+       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++;
+                       sleep(1);
+               }
+       }
+
        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$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);
                }
@@ -1731,6 +1695,7 @@ sub run_test {
                        system("tree $udev_root");
                        print "\n";
                        $error++;
+                       sleep(1);
                }
        }
 
@@ -1750,6 +1715,7 @@ sub run_test {
                        system("tree $udev_root");
                        print "\n";
                        $error++;
+                       sleep(1);
                }
        } else {
                print "remove:      ok\n";
@@ -1758,8 +1724,7 @@ sub run_test {
        print "\n";
 
        if (defined($rules->{option}) && $rules->{option} eq "clean") {
-               system("rm -rf $udev_root");
-               mkdir($udev_root) || die "unable to create udev_root: $udev_root\n";
+               make_udev_root ();
        }
 
 }
@@ -1772,27 +1737,36 @@ if (!($<==0)) {
 }
 
 # prepare
-system("rm -rf $udev_root");
-mkdir($udev_root) || die "unable to create udev_root: $udev_root\n";
+make_udev_root();
 
 # 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_rules=\"$udev_rules\"\n";
-print CONF "udev_log=\"info\"\n";
+print CONF "udev_run=\"$udev_root/.udev\"\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
@@ -1811,3 +1785,7 @@ system("rm -rf $udev_root");
 unlink($udev_rules);
 unlink($udev_conf);
 
+if ($error > 0) {
+    exit(1);
+}
+exit(0);