fixups to get back to proper patch order

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

diff --git a/test/udev-test.pl b/test/udev-test.pl
index e8ce0b44ddfdbe52461d228cf84b7f0433051fb8..d584579584ba2b7bb7606ba2ebaed0d32ba26d93 100644 (file)
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -30,7 +30,7 @@ my $PWD = $ENV{PWD};
 my $sysfs     = "sys/";
 my $udev_bin  = "../udev";
 my $udev_root = "udev-root/"; # !!! directory will be removed !!!
 my $sysfs     = "sys/";
 my $udev_bin  = "../udev";
 my $udev_root = "udev-root/"; # !!! directory will be removed !!!

-my $udev_db   = ".udev.tdb";
+my $udev_db   = ".udevdb";

 my $perm      = "udev.permissions";
 my $main_conf = "udev-test.conf";
 my $conf_tmp  = "udev-test.rules";
 my $perm      = "udev.permissions";
 my $main_conf = "udev-test.conf";
 my $conf_tmp  = "udev-test.rules";


@@ -1102,6 +1102,48 @@ EOF
                exp_name        => "cdrom",
                conf            => <<EOF
 KERNEL="sda", NAME="cdrom%e"
                exp_name        => "cdrom",
                conf            => <<EOF
 KERNEL="sda", NAME="cdrom%e"

+EOF
+       },
+       {
+               desc            => "ignore remove event test",
+               subsys          => "block",
+               devpath         => "/block/sda",
+               exp_name        => "node",
+               exp_error       => "yes",
+               conf            => <<EOF
+BUS="scsi", KERNEL="sda", NAME{ignore_remove}="node"
+EOF
+       },
+       {
+               desc            => "ignore remove event test (with all partitions)",
+               subsys          => "block",
+               devpath         => "/block/sda",
+               exp_name        => "node14",
+               exp_error       => "yes",
+               option          => "clear",
+               conf            => <<EOF
+BUS="scsi", KERNEL="sda", NAME{ignore_remove, all_partitions}="node"
+EOF
+       },
+       {
+               desc            => "SUBSYSTEM match test",
+               subsys          => "block",
+               devpath         => "/block/sda",
+               exp_name        => "node",
+               conf            => <<EOF
+BUS="scsi", KERNEL="sda", NAME="should_not_match", SUBSYSTEM="vc"
+BUS="scsi", KERNEL="sda", NAME="node", SUBSYSTEM="block"
+BUS="scsi", KERNEL="sda", NAME="should_not_match2", SUBSYSTEM="vc"
+EOF
+       },
+       {
+               desc            => "DRIVER match test",
+               subsys          => "block",
+               devpath         => "/block/sda",
+               exp_name        => "node",
+               conf            => <<EOF
+BUS="scsi", KERNEL="sda", NAME="should_not_match", DRIVER="sd-wrong"
+BUS="scsi", KERNEL="sda", NAME="node", DRIVER="sd"

 EOF
        },
 );
 EOF
        },
 );


@@ -1268,7 +1310,7 @@ sub run_test {
        }
 
        if (defined($config->{option}) && $config->{option} eq "clear") {
        }
 
        if (defined($config->{option}) && $config->{option} eq "clear") {

-               unlink($udev_db);
+               system("rm -rf $udev_db");

                system("rm -rf $udev_root");
                mkdir($udev_root) || die "unable to create udev_root: $udev_root\n";
        }
                system("rm -rf $udev_root");
                mkdir($udev_root) || die "unable to create udev_root: $udev_root\n";
        }


@@ -1319,7 +1361,7 @@ if ($ARGV[0]) {
 print "$error errors occured\n\n";
 
 # cleanup
 print "$error errors occured\n\n";
 
 # cleanup

-unlink($udev_db);
+system("rm -rf $udev_db");

 system("rm -rf $udev_root");
 unlink($conf_tmp);
 unlink($main_conf);
 system("rm -rf $udev_root");
 unlink($conf_tmp);
 unlink($main_conf);