[PATCH] pattern matching for namedev

[elogind.git] / test / udev-test.pl

diff --git a/test/udev-test.pl b/test/udev-test.pl
index ee2f4e691eca25b20b8d897f18b6c838b70f2408..47190f6e5de217ebf88db1d5dd57144f7ba04724 100644 (file)
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -48,6 +48,37 @@ EOF
                expected => "boot_disk1" ,
                conf     => <<EOF
 LABEL, BUS="scsi", vendor="IBM-ESXS", NAME="boot_disk%n"
+EOF
+       },
+       {
+               desc     => "catch device by *",
+               subsys   => "tty",
+               devpath  => "class/tty/ttyUSB0",
+               expected => "visor/0" ,
+               conf     => <<EOF
+REPLACE, KERNEL="ttyUSB*", NAME="visor/%n"
+EOF
+       },
+       {
+               desc     => "catch device by ?",
+               subsys   => "tty",
+               devpath  => "class/tty/ttyUSB0",
+               expected => "visor/0" ,
+               conf     => <<EOF
+REPLACE, KERNEL="ttyUSB??*", NAME="visor/%n-1"
+REPLACE, KERNEL="ttyUSB??", NAME="visor/%n-2"
+REPLACE, KERNEL="ttyUSB?", NAME="visor/%n"
+EOF
+       },
+       {
+               desc     => "catch device by character class",
+               subsys   => "tty",
+               devpath  => "class/tty/ttyUSB0",
+               expected => "visor/0" ,
+               conf     => <<EOF
+REPLACE, KERNEL="ttyUSB[A-Z]*", NAME="visor/%n-1"
+REPLACE, KERNEL="ttyUSB?[0-9]", NAME="visor/%n-2"
+REPLACE, KERNEL="ttyUSB[0-9]*", NAME="visor/%n"
 EOF
        },
        {
@@ -87,7 +118,7 @@ TOPOLOGY, BUS="scsi", PLACE="0:0:0:0", NAME="Major:%M:minor:%m:kernelnumber:%n:b
 EOF
        },
        {
-               desc     => "callout result substitution, only last should match",
+               desc     => "callout result substitution",
                subsys   => "block",
                devpath  => "block/sda/sda3",
                expected => "special-device-3" ,
@@ -124,6 +155,17 @@ EOF
                expected => "lun0/part2" ,
                conf     => <<EOF
 LABEL, BUS="scsi", vendor="IBM-ESXS", NAME="lun0/%D"
+EOF
+       },
+       {
+               desc     => "callout bus type",
+               subsys   => "block",
+               devpath  => "block/sda",
+               expected => "scsi-0:0:0:0" ,
+               conf     => <<EOF
+CALLOUT, BUS="usb", PROGRAM="/bin/echo -n usb-%b", ID="*", NAME="%c"
+CALLOUT, BUS="scsi", PROGRAM="/bin/echo -n scsi-%b", ID="*", NAME="%c"
+CALLOUT, BUS="foo", PROGRAM="/bin/echo -n foo-%b", ID="*", NAME="%c"
 EOF
        },
 );
@@ -141,7 +183,7 @@ sub udev {
        my ($action, $subsys, $devpath, $config) = @_;
 
        $ENV{DEVPATH} = $devpath;
-       $ENV{UDEV_CONFIG_FILE} = $conf_tmp;
+       $ENV{UDEV_RULES_FILE} = $conf_tmp;
 
        # create temporary config
        open CONF, ">$conf_tmp" || die "unable to create config file: $conf_tmp";