chiark / gitweb /
remove broken %e enumeration
[elogind.git] / test / udev-test.pl
index 7ce920092fc05b0a99d888ca592ef84f62a01a5e..9a88d062715cc823f6c62956bdeb58af5f3a151e 100755 (executable)
@@ -231,7 +231,7 @@ KERNEL=="ttyUSB0", NAME="sub/direct/ory/visor"
 EOF
        },
        {
-               desc            => "place on bus of scsi partition",
+               desc            => "parent device name match of scsi partition",
                subsys          => "block",
                devpath         => "/block/sda/sda3",
                exp_name        => "first_disk3" ,
@@ -243,18 +243,18 @@ EOF
                desc            => "test substitution chars",
                subsys          => "block",
                devpath         => "/block/sda/sda3",
-               exp_name        => "Major:8:minor:3:kernelnumber:3" ,
+               exp_name        => "Major:8:minor:3:kernelnumber:3:id:0:0:0:0" ,
                rules           => <<EOF
-BUS=="scsi", ID=="0:0:0:0", NAME="Major:%M:minor:%m:kernelnumber:%n"
+BUS=="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-bsd-sIBM" ,
+               exp_name        => "M8-m3-n3-b0:0-sIBM" ,
                rules           => <<EOF
-BUS=="scsi", ID=="0:0:0:0", NAME="M%M-m%m-n%n-b%2k-s%3s{vendor}"
+BUS=="scsi", ID=="0:0:0:0", NAME="M%M-m%m-n%n-b%3b-s%3s{vendor}"
 EOF
        },
        {
@@ -298,15 +298,6 @@ BUS=="scsi", PROGRAM=="/bin/echo -n special-device", RESULT=="special--*", NAME=
 BUS=="scsi", PROGRAM=="/bin/echo -n special-device", RESULT=="special-device-", NAME="%c-3-%n"
 BUS=="scsi", PROGRAM=="/bin/echo -n special-device", RESULT=="special-devic", NAME="%c-4-%n"
 BUS=="scsi", PROGRAM=="/bin/echo -n special-device", RESULT=="special-*", NAME="%c-%n"
-EOF
-       },
-       {
-               desc            => "program result substitution (no argument should be subsystem)",
-               subsys          => "block",
-               devpath         => "/block/sda/sda3",
-               exp_name        => "subsys_block" ,
-               rules           => <<EOF
-BUS=="scsi", PROGRAM=="/bin/echo", RESULT=="block", NAME="subsys_block"
 EOF
        },
        {
@@ -322,9 +313,9 @@ EOF
                desc            => "program result substitution",
                subsys          => "block",
                devpath         => "/block/sda/sda3",
-               exp_name        => "test-3" ,
+               exp_name        => "test-0:0:0:0" ,
                rules           => <<EOF
-BUS=="scsi", PROGRAM=="/bin/echo -n test-%n", RESULT=="test-3*", NAME="%c"
+BUS=="scsi", PROGRAM=="/bin/echo -n test-%b", RESULT=="test-0:0*", NAME="%c"
 EOF
        },
        {
@@ -385,27 +376,27 @@ EOF
                desc            => "test substitution by variable name",
                subsys          => "block",
                devpath         => "/block/sda/sda3",
-               exp_name        => "Major:8-minor:3-kernelnumber:3,
+               exp_name        => "Major:8-minor:3-kernelnumber:3-id:0:0:0:0",
                rules           => <<EOF
-BUS=="scsi", ID=="0:0:0:0", NAME="Major:\$major-minor:\$minor-kernelnumber:\$number"
+BUS=="scsi", ID=="0:0:0:0", NAME="Major:\$major-minor:\$minor-kernelnumber:\$number-id:\$id"
 EOF
        },
        {
                desc            => "test substitution by variable name 2",
                subsys          => "block",
                devpath         => "/block/sda/sda3",
-               exp_name        => "Major:8-minor:3-kernelnumber:3-name:sda3" ,
+               exp_name        => "Major:8-minor:3-kernelnumber:3-id:0:0:0:0",
                rules           => <<EOF
-BUS=="scsi", ID=="0:0:0:0", DEVPATH="*/sda/*", NAME="Major:\$major-minor:%m-kernelnumber:\$number-name:\$kernel"
+BUS=="scsi", ID=="0:0:0:0", DEVPATH=="*/sda/*", NAME="Major:\$major-minor:%m-kernelnumber:\$number-id:\$id"
 EOF
        },
        {
                desc            => "test substitution by variable name 3",
                subsys          => "block",
                devpath         => "/block/sda/sda3",
-               exp_name        => "83sda33" ,
+               exp_name        => "830:0:0:03" ,
                rules           => <<EOF
-BUS=="scsi", ID=="0:0:0:0", DEVPATH="*/sda/*", NAME="%M%m%k%n"
+BUS=="scsi", ID=="0:0:0:0", DEVPATH=="*/sda/*", NAME="%M%m%b%n"
 EOF
        },
        {
@@ -414,40 +405,30 @@ EOF
                devpath         => "/block/sda/sda3",
                exp_name        => "833" ,
                rules           => <<EOF
-BUS=="scsi", ID=="0:0:0:0", DEVPATH="*/sda/*", NAME="\$major\$minor\$number"
+BUS=="scsi", ID=="0:0:0:0", DEVPATH=="*/sda/*", NAME="\$major\$minor\$number"
 EOF
        },
        {
                desc            => "test substitution by variable name 5",
                subsys          => "block",
                devpath         => "/block/sda/sda3",
-               exp_name        => "833sda3" ,
+               exp_name        => "8330:0:0:0" ,
                rules           => <<EOF
-BUS=="scsi", ID=="0:0:0:0", DEVPATH="*/sda/*", NAME="\$major%m%n\$kernel"
+BUS=="scsi", ID=="0:0:0:0", DEVPATH=="*/sda/*", NAME="\$major%m%n\$id"
 EOF
        },
        {
-               desc            => "invalid program for device with no bus",
+               desc            => "non matching BUS for device with no parent",
                subsys          => "tty",
                devpath         => "/class/tty/console",
-               exp_name        => "TTY" ,
+               exp_name        => "TTY",
                rules           => <<EOF
 BUS=="scsi", PROGRAM=="/bin/echo -n foo", RESULT=="foo", NAME="foo"
 KERNEL=="console", NAME="TTY"
 EOF
        },
        {
-               desc            => "valid program for device with no bus",
-               subsys          => "tty",
-               devpath         => "/class/tty/console",
-               exp_name        => "foo" ,
-               rules           => <<EOF
-PROGRAM=="/bin/echo -n foo", RESULT=="foo", NAME="foo"
-KERNEL=="console", NAME="TTY"
-EOF
-       },
-       {
-               desc            => "invalid label for device with no bus",
+               desc            => "non matching BUS",
                subsys          => "tty",
                devpath         => "/class/tty/console",
                exp_name        => "TTY" ,
@@ -457,7 +438,7 @@ KERNEL=="console", NAME="TTY"
 EOF
        },
        {
-               desc            => "valid label for device with no bus",
+               desc            => "SYSFS match",
                subsys          => "tty",
                devpath         => "/class/tty/console",
                exp_name        => "foo" ,
@@ -470,11 +451,11 @@ EOF
                desc            => "program and bus type match",
                subsys          => "block",
                devpath         => "/block/sda",
-               exp_name        => "scsi-sda" ,
+               exp_name        => "scsi-0:0:0:0" ,
                rules           => <<EOF
-BUS=="usb", PROGRAM=="/bin/echo -n usb-%k", NAME="%c"
-BUS=="scsi", PROGRAM=="/bin/echo -n scsi-%k", NAME="%c"
-BUS=="foo", PROGRAM=="/bin/echo -n foo-%k", NAME="%c"
+BUS=="usb", PROGRAM=="/bin/echo -n usb-%b", NAME="%c"
+BUS=="scsi", PROGRAM=="/bin/echo -n scsi-%b", NAME="%c"
+BUS=="foo", PROGRAM=="/bin/echo -n foo-%b", NAME="%c"
 EOF
        },
        {
@@ -797,7 +778,7 @@ EOF
                exp_name        => "symlink2-ttyUSB0",
                exp_target      => "ttyUSB0",
                rules           => <<EOF
-KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="symlink1-%n symlink2-%k"
+KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="symlink1-%n symlink2-%k symlink3-%b"
 EOF
        },
        {
@@ -881,6 +862,7 @@ EOF
                devpath         => "/class/tty/tty0",
                exp_name        => "link",
                exp_target      => "link",
+               exp_add_error   => "yes",
                exp_rem_error   => "yes",
                option          => "clean",
                rules           => <<EOF
@@ -918,13 +900,13 @@ KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK+="major-%M:%m"
 EOF
        },
        {
-               desc            => "symlink %k substitution",
+               desc            => "symlink %b substitution",
                subsys          => "block",
                devpath         => "/block/sda",
-               exp_name        => "symlink-sda",
+               exp_name        => "symlink-0:0:0:0",
                exp_target      => "node",
                rules           => <<EOF
-BUS=="scsi", KERNEL=="sda", NAME="node", SYMLINK+="symlink-%k"
+BUS=="scsi", KERNEL=="sda", NAME="node", SYMLINK+="symlink-%b"
 EOF
        },
        {
@@ -1026,74 +1008,6 @@ EOF
                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
        },
        {
@@ -1310,8 +1224,8 @@ EOF
                devpath         => "/block/sda/sda1",
                exp_name        => "part",
                rules           => <<EOF
-SUBSYSTEM=="block", KERNEL="*[0-9]", ENV{PARTITION}="true", ENV{MAINDEVICE}="false"
-SUBSYSTEM=="block", KERNEL="*[!0-9]", ENV{PARTITION}="false", ENV{MAINDEVICE}="true"
+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"
@@ -1547,6 +1461,43 @@ KERNEL=="sda1", NAME="wrong"
 KERNEL=="sda1", NAME="", LABEL="NO"
 KERNEL=="sda1", NAME="right", LABEL="TEST"
 KERNEL=="sda1", NAME="wrong2"
+EOF
+       },
+       {
+               desc            => "NAME compare test",
+               subsys          => "block",
+               devpath         => "/block/sda/sda1",
+               exp_name        => "link",
+               exp_target      => "node",
+               not_exp_name    => "wronglink",
+               rules           => <<EOF
+KERNEL=="sda1", NAME="node"
+KERNEL=="sda2", NAME="wrong"
+KERNEL=="sda1", NAME=="wrong*", SYMLINK+="wronglink"
+KERNEL=="sda1", NAME=="?*", SYMLINK+="link"
+KERNEL=="sda1", NAME=="node*", SYMLINK+="link2"
+EOF
+       },
+       {
+               desc            => "NAME compare test 2",
+               subsys          => "block",
+               devpath         => "/block/sda/sda1",
+               exp_name        => "link2",
+               exp_target      => "sda1",
+               not_exp_name    => "link",
+               rules           => <<EOF
+KERNEL=="sda1", NAME=="?*", SYMLINK+="link"
+KERNEL=="sda1", NAME!="?*", SYMLINK+="link2"
+EOF
+       },
+       {
+               desc            => "invalid key operation",
+               subsys          => "block",
+               devpath         => "/block/sda/sda1",
+               exp_name        => "yes",
+               rules           => <<EOF
+KERNEL="sda1", NAME=="no"
+KERNEL=="sda1", NAME="yes"
 EOF
        },
 );
@@ -1564,13 +1515,6 @@ sub udev {
 
        $ENV{DEVPATH} = $devpath;
 
-       open my $fd, "$sysfs$devpath/dev";
-       my $dev = <$fd>;
-       close $fd;
-       $dev =~ m/^(.+):(.+)$/;
-       $ENV{MAJOR} = $1;
-       $ENV{MINOR} = $2;
-
        # create temporary rules
        open CONF, ">$udev_rules" || die "unable to create rules file: $udev_rules";
        print CONF $$rules;