X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=test%2Fudev-test.pl;h=4322da5ecd202d0fbce2f2a6f998739b48c85a05;hp=aeca9486f7c9c2041c3d72b89d060cad1ee14138;hb=b3ca87a04a6bc32d852774211b35313ec8a09da1;hpb=5754e74c089a727183a281aa9071979dff2a9477

diff --git a/test/udev-test.pl b/test/udev-test.pl
index aeca9486f..4322da5ec 100755
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -490,16 +490,6 @@ EOF
 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		=> "create all possible partitions",
-		subsys		=> "block",
-		devpath		=> "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
-		exp_name	=> "sda15" ,
-		exp_majorminor	=> "8:15",
-		rules		=> <<EOF
-SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", OPTIONS="all_partitions"
 EOF
 	},
 	{
@@ -620,7 +610,7 @@ EOF
 		subsys		=> "tty",
 		devpath		=> "/devices/virtual/tty/tty33",
 		exp_name	=> "tty33",
-		exp_perms	=> "0:0:0660",
+		exp_perms	=> "0:0:0600",
 		rules		=> <<EOF
 KERNEL=="tty33", SYMLINK+="tty33", OWNER="bad", GROUP="name"
 EOF
@@ -630,7 +620,7 @@ EOF
 		subsys		=> "block",
 		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
 SUBSYSTEMS=="scsi", KERNEL=="sda", SYMLINK+="node", OWNER="5000"
 EOF
@@ -650,7 +640,7 @@ EOF
 		subsys		=> "block",
 		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
 SUBSYSTEMS=="scsi", KERNEL=="sda", SYMLINK+="node", OWNER="nobody"
 EOF
@@ -985,49 +975,6 @@ EOF
 		exp_name	=> "link4",
 		rules		=> <<EOF
 SUBSYSTEMS=="scsi", PROGRAM=="/bin/echo -n node link1 link2 link3 link4", RESULT=="node *", SYMLINK+="%c{2+}"
-EOF
-	},
-	{
-		desc		=> "all_partitions, option-only rule",
-		subsys		=> "block",
-		devpath		=> "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
-		exp_name	=> "node6",
-		exp_rem_error	=> "yes",
-		rules		=> <<EOF
-SUBSYSTEM=="block", OPTIONS="all_partitions"
-SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="node"
-EOF
-	},
-	{
-		desc		=> "all_partitions, option-only rule (fail on partition)",
-		subsys		=> "block",
-		devpath		=> "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1",
-		exp_name	=> "node6",
-		exp_add_error	=> "yes",
-		rules		=> <<EOF
-SUBSYSTEM=="block", OPTIONS="all_partitions"
-SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="node"
-EOF
-	},
-	{
-		desc		=> "ignore remove event test",
-		subsys		=> "block",
-		devpath		=> "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
-		exp_name	=> "node",
-		exp_rem_error	=> "yes",
-		rules		=> <<EOF
-SUBSYSTEMS=="scsi", KERNEL=="sda", SYMLINK+="node", OPTIONS="ignore_remove"
-EOF
-	},
-	{
-		desc		=> "ignore remove event test (with all partitions)",
-		subsys		=> "block",
-		devpath		=> "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
-		exp_name	=> "sda14",
-		exp_rem_error	=> "yes",
-		option		=> "clean",
-		rules		=> <<EOF
-SUBSYSTEMS=="scsi", KERNEL=="sda", OPTIONS="ignore_remove, all_partitions"
 EOF
 	},
 	{
@@ -1316,17 +1263,6 @@ EOF
 KERNEL=="ttyACM[0-9]*", SYMLINK+="one"
 KERNEL=="ttyACM[0-9]*", SYMLINK+="two"
 KERNEL=="ttyACM[0-9]*", SYMLINK="three"
-EOF
-	},
-	{
-		desc		=> "test empty NAME",
-		subsys		=> "tty",
-		devpath		=> "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
-		exp_name	=> "<none>",
-		not_exp_name	=> "ttyACM0",
-		exp_add_error	=> "yes",
-		rules		=> <<EOF
-KERNEL=="ttyACM[0-9]*", NAME=""
 EOF
 	},
 	{
@@ -1551,7 +1487,7 @@ EOF
 		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:0660",
+		exp_perms	=> "0:0:0440",
 		exp_rem_error	=> "yes",
 		rules		=> <<EOF
 KERNEL=="sda", MODE="440"
@@ -1563,7 +1499,7 @@ EOF
 		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:0660",
+		exp_perms	=> "0:0:0600",
 		rules		=> <<EOF
 KERNEL=="sda", PROGRAM="/bin/true create-envp"
 KERNEL=="sda", ENV{TESTENV}="change-envp"
@@ -1796,6 +1732,7 @@ 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_run=\"$udev_root/.udev\"\n";
 print CONF "udev_rules=\"$PWD\"\n";
 print CONF "udev_log=\"err\"\n";
 close CONF;