X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=test%2Fudev-test.pl;h=578adc4df19646eda9875a65869f36a5edccc0b3;hp=5f6f864df2f137aff9cf6321dd53154e60b7b7bf;hb=e93901468c668f3dda6f57ee7f4b953e287b1622;hpb=6818c51d7abeab9914eb7193968b1efa9459a853

diff --git a/test/udev-test.pl b/test/udev-test.pl
index 5f6f864df..578adc4df 100644
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -31,10 +31,12 @@ my $sysfs     = "sys/";
 my $udev_bin  = "../udev";
 my $udev_root = "udev-root/"; # !!! directory will be removed !!!
 my $udev_db   = ".udevdb";
-my $perm      = "udev.permissions";
 my $main_conf = "udev-test.conf";
 my $conf_tmp  = "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 @tests = (
 	{
@@ -185,6 +187,36 @@ EOF
 
 KERNEL="ttyUSB0", NAME="visor"
 
+EOF
+	},
+	{
+		desc		=> "Handle backslashed multi lines in config file (and replace kernel name)",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/ttyUSB0",
+		exp_name	=> "visor" ,
+		conf		=> <<EOF
+KERNEL="ttyUSB0", \\
+NAME="visor"
+
+EOF
+	},
+	{
+		desc		=> "Handle stupid backslashed multi lines in config file (and replace kernel name)",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/ttyUSB0",
+		exp_name	=> "visor" ,
+		conf		=> <<EOF
+
+#
+\\
+
+\\\\
+
+#\\
+
+KERNEL="ttyUSB0", \\
+	NAME="visor"
+
 EOF
 	},
 	{
@@ -500,187 +532,37 @@ BUS="scsi", SYSFS{whitespace_test}="WHITE  SPACE   ", NAME="matched-with-space"
 EOF
 	},
 	{
-		desc		=> "permissions test",
-		subsys		=> "block",
-		devpath		=> "/block/sda",
-		exp_name	=> "node",
-		exp_perms	=> "5000::0444",
-		conf		=> <<EOF
-BUS="scsi", KERNEL="sda", NAME="node", OWNER="5000", MODE="0444"
-EOF
-	},
-	{
-		desc		=> "permissions ttyUSB0:root:uucp:0660",
-		subsys		=> "tty",
-		devpath		=> "/class/tty/ttyUSB0",
-		exp_name	=> "ttyUSB0",
-		exp_perms	=> "0:14:0660",
-		conf		=> <<EOF
-KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n"
-EOF
-	},
-	{
-		desc		=> "permissions tty0::root:0444",
-		subsys		=> "tty",
-		devpath		=> "/class/tty/tty0",
-		exp_name	=> "tty0",
-		exp_perms	=> "0:0:0444",
-		conf		=> <<EOF
-KERNEL="tty0", NAME="tty0"
-EOF
-	},
-	{
-		desc		=> "permissions tty1:root::0555",
-		subsys		=> "tty",
-		devpath		=> "/class/tty/tty1",
-		exp_name	=> "tty1",
-		exp_perms	=> "0:0:0555",
-		conf		=> <<EOF
-KERNEL="tty1", NAME="tty1"
-EOF
-	},
-	{
-		desc		=> "permissions tty2:::0777",
-		subsys		=> "tty",
-		devpath		=> "/class/tty/tty2",
-		exp_name	=> "tty2",
-		exp_perms	=> "0:0:0777",
-		conf		=> <<EOF
-KERNEL="tty2", NAME="tty2"
-EOF
-	},
-	{
-		desc		=> "permissions tty3::: (default mode applied)",
-		subsys		=> "tty",
-		devpath		=> "/class/tty/tty3",
-		exp_name	=> "tty3",
-		exp_perms	=> "0:0:600",
-		conf		=> <<EOF
-KERNEL="tty3", NAME="tty3"
-EOF
-	},
-	{
-		desc		=> "permissions i2c-300:root:sys:0744",
-		subsys		=> "i2c-dev",
-		devpath		=> "/class/i2c-dev/i2c-300",
-		exp_name	=> "i2c-300",
-		exp_perms	=> "0:3:0744",
-		conf		=> <<EOF
-KERNEL="i2c-300", NAME="i2c-300"
-EOF
-	},
-	{
-		desc		=> "permissions i2c-fake1:root:7:0007",
-		subsys		=> "i2c-dev",
-		devpath		=> "/class/i2c-dev/i2c-fake1",
-		exp_name	=> "i2c-fake1",
-		exp_perms	=> "0:7:0007",
-		conf		=> <<EOF
-KERNEL="i2c-fake1", NAME="i2c-fake1"
-EOF
-	},
-	{
-		desc		=> "permissions ttyS[01]:0:5:0700",
-		subsys		=> "tty",
-		devpath		=> "/class/tty/ttyS1",
-		exp_name	=> "ttyS1",
-		exp_perms	=> "0:5:0700",
-		conf		=> <<EOF
-KERNEL="ttyS1", NAME="ttyS1"
-EOF
-	},
-	{
-		desc		=> "permissions ttyS[4-9]:tty:5:0060",
-		subsys		=> "tty",
-		devpath		=> "/class/tty/ttyS7",
-		exp_name	=> "ttyS7",
-		exp_perms	=> "0:5:0060",
-		conf		=> <<EOF
-KERNEL="ttyS7", NAME="ttyS7"
-EOF
-	},
-	{
-		desc		=> "permissions tty4:0:5:0707",
-		subsys		=> "ttyS4",
-		devpath		=> "/class/tty/tty4",
-		exp_name	=> "tty4",
-		exp_perms	=> "0:5:0707",
-		conf		=> <<EOF
-KERNEL="tty4", NAME="tty4"
-EOF
-	},
-	{
-		desc		=> "permissions tty4?:0:5:0007",
-		subsys		=> "tty",
-		devpath		=> "/class/tty/tty44",
-		exp_name	=> "tty44",
-		exp_perms	=> "0:5:0007",
-		conf		=> <<EOF
-KERNEL="tty44", NAME="tty44"
-EOF
-	},
-	{
-		desc		=> "permissions tty3[!3]:::0467",
-		subsys		=> "tty",
-		devpath		=> "/class/tty/tty35",
-		exp_name	=> "tty35",
-		exp_perms	=> "0:0:0467",
-		conf		=> <<EOF
-KERNEL="tty35", NAME="tty35"
-EOF
-	},
-	{
-		desc		=> "permissions tty33:bad:name:0500",
+		desc		=> "permissions USER=bad GROUP=name",
 		subsys		=> "tty",
 		devpath		=> "/class/tty/tty33",
 		exp_name	=> "tty33",
-		exp_perms	=> "0:0:0500",
+		exp_perms	=> "0:0:0660",
 		conf		=> <<EOF
-KERNEL="tty33", NAME="tty33"
+KERNEL="tty33", NAME="tty33", OWNER="bad", GROUP="name"
 EOF
 	},
 	{
-		desc		=> "permissions rtc:0:users:0600",
-		subsys		=> "misc",
-		devpath		=> "/class/misc/rtc",
-		exp_name	=> "misc/rtc",
-		exp_perms	=> "0:100:0600",
-		conf		=> <<EOF
-KERNEL="rtc", NAME="misc/rtc"
-EOF
-	},
-	{
-		desc		=> "permissions misc:0:users:0600",
-		subsys		=> "misc",
-		devpath		=> "/class/misc/psaux",
-		exp_name	=> "misc/psaux",
-		exp_perms	=> "0:100:0600",
-		conf		=> <<EOF
-KERNEL="psaux", NAME="misc/psaux"
-EOF
-	},
-	{
-		desc		=> "permissions set OWNER=5000",
+		desc		=> "permissions OWNER=5000",
 		subsys		=> "block",
 		devpath		=> "/block/sda",
 		exp_name	=> "node",
-		exp_perms	=> "5000::0600",
+		exp_perms	=> "5000::0660",
 		conf		=> <<EOF
 BUS="scsi", KERNEL="sda", NAME="node", OWNER="5000"
 EOF
 	},
 	{
-		desc		=> "permissions set GROUP=100",
+		desc		=> "permissions GROUP=100",
 		subsys		=> "block",
 		devpath		=> "/block/sda",
 		exp_name	=> "node",
-		exp_perms	=> ":100:0600",
+		exp_perms	=> ":100:0660",
 		conf		=> <<EOF
 BUS="scsi", KERNEL="sda", NAME="node", GROUP="100"
 EOF
 	},
 	{
-		desc		=> "permissions set mode=0777",
+		desc		=> "permissions MODE=0777",
 		subsys		=> "block",
 		devpath		=> "/block/sda",
 		exp_name	=> "node",
@@ -690,7 +572,7 @@ BUS="scsi", KERNEL="sda", NAME="node", MODE="0777"
 EOF
 	},
 	{
-		desc		=> "permissions set OWNER=5000 GROUP=100 MODE=0777",
+		desc		=> "permissions OWNER=5000 GROUP=100 MODE=0777",
 		subsys		=> "block",
 		devpath		=> "/block/sda",
 		exp_name	=> "node",
@@ -700,17 +582,17 @@ BUS="scsi", KERNEL="sda", NAME="node", OWNER="5000", GROUP="100", MODE="0777"
 EOF
 	},
 	{
-		desc		=> "permissions override OWNER to 5000",
+		desc		=> "permissions OWNER to 5000",
 		subsys		=> "tty",
 		devpath		=> "/class/tty/ttyUSB0",
 		exp_name	=> "ttyUSB0",
-		exp_perms	=> "5000:14:0660",
+		exp_perms	=> "5000::",
 		conf		=> <<EOF
 KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", OWNER="5000"
 EOF
 	},
 	{
-		desc		=> "permissions override GROUP to 100",
+		desc		=> "permissions GROUP to 100",
 		subsys		=> "tty",
 		devpath		=> "/class/tty/ttyUSB0",
 		exp_name	=> "ttyUSB0",
@@ -720,23 +602,35 @@ KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", GROUP="100"
 EOF
 	},
 	{
-		desc		=> "permissions override MODE to 0060",
+		desc		=> "permissions MODE to 0060",
 		subsys		=> "tty",
 		devpath		=> "/class/tty/ttyUSB0",
 		exp_name	=> "ttyUSB0",
-		exp_perms	=> ":14:0060",
+		exp_perms	=> "::0060",
 		conf		=> <<EOF
 KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", MODE="0060"
 EOF
 	},
 	{
-		desc		=> "permissions override OWNER, GROUP, MODE",
+		desc		=> "permissions OWNER, GROUP, MODE",
 		subsys		=> "tty",
 		devpath		=> "/class/tty/ttyUSB0",
 		exp_name	=> "ttyUSB0",
 		exp_perms	=> "5000:100:0777",
 		conf		=> <<EOF
 KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", OWNER="5000", GROUP="100", MODE="0777"
+EOF
+	},
+	{
+		desc		=> "permissions only rule",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/ttyUSB0",
+		exp_name	=> "ttyUSB0",
+		exp_perms	=> "5000:100:0777",
+		conf		=> <<EOF
+KERNEL="ttyUSB[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"
 EOF
 	},
 	{
@@ -1105,7 +999,28 @@ KERNEL="sda", NAME="cdrom%e"
 EOF
 	},
 	{
-		desc		=> "SUBSYSTEM test",
+		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",
@@ -1113,6 +1028,16 @@ 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
 	},
 );
@@ -1122,6 +1047,7 @@ $ENV{UDEV_TEST} = "yes";
 $ENV{SYSFS_PATH} = $sysfs;
 $ENV{UDEV_CONFIG_FILE} = $main_conf;
 $ENV{UDEV_NO_DEVD} = "yes";
+$ENV{UDEV_NO_HOTPLUGD} = "yes";
 
 
 sub udev {
@@ -1228,7 +1154,6 @@ sub run_test {
 
 
 	udev("add", $config->{subsys}, $config->{devpath}, \$config->{conf});
-
 	if ((-e "$PWD/$udev_root$config->{exp_name}") ||
 	    (-l "$PWD/$udev_root$config->{exp_name}")) {
 
@@ -1302,7 +1227,9 @@ open CONF, ">$main_conf" || die "unable to create config file: $main_conf";
 print CONF "udev_root=\"$udev_root\"\n";
 print CONF "udev_db=\"$udev_db\"\n";
 print CONF "udev_rules=\"$conf_tmp\"\n";
-print CONF "udev_permissions=\"$perm\"\n";
+print CONF "default_mode=\"0660\"\n";
+print CONF "default_owner=\"root\"\n";
+print CONF "default_group=\"root\"\n";
 close CONF;
 
 my $test_num = 1;