X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=test%2Fudev-test.pl;h=4f61ce3e5ddf0b40fda8c928032f1ffeccf26693;hp=f630b74a9d859247ed96ab3ed38e282e15d0577d;hb=10b2d011e70ddf9361c61f6147dc88f670d28abd;hpb=91a75e4ad4071d9d0ce1adb5c8d8272aac379d0a

diff --git a/test/udev-test.pl b/test/udev-test.pl
index f630b74a9..4f61ce3e5 100755
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -30,13 +30,21 @@ my $udev_conf		= "udev-test.conf";
 my $udev_rules		= "udev-test.rules";
 
 my @tests = (
+	{
+		desc		=> "no rules",
+		subsys		=> "block",
+		devpath		=> "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
+		exp_name	=> "sda" ,
+		rules		=> <<EOF
+EOF
+	},
 	{
 		desc		=> "label test of scsi disc (old key names)",
 		subsys		=> "block",
 		devpath		=> "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
 		exp_name	=> "boot_disk" ,
 		rules		=> <<EOF
-SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", NAME="boot_disk%n"
+SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", NAME="boot_disk%n", RUN+="socket:@/org/kernel/udev/monitor"
 KERNEL=="ttyACM0", NAME="modem"
 EOF
 	},
@@ -472,6 +480,33 @@ EOF
 		rules		=> <<EOF
 KERNEL=="console", NAME="TTY"
 ATTRS{dev}=="5:1", NAME="foo"
+EOF
+	},
+	{
+		desc		=> "ATTR (empty file)",
+		subsys		=> "tty",
+		devpath		=> "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
+		exp_name	=> "empty" ,
+		rules		=> <<EOF
+KERNEL=="sda", ATTR{test_empty_file}=="?*", NAME:="something"
+KERNEL=="sda", ATTR{test_empty_file}!="", NAME:="not-empty"
+KERNEL=="sda", ATTR{test_empty_file}=="", NAME:="empty"
+KERNEL=="sda", ATTR{test_empty_file}!="?*", NAME:="not-something"
+KERNEL=="sda", NAME="wrong"
+EOF
+	},
+	{
+		desc		=> "ATTR (non-existent file)",
+		subsys		=> "tty",
+		devpath		=> "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
+		exp_name	=> "non-existent" ,
+		rules		=> <<EOF
+KERNEL=="sda", ATTR{nofile}=="?*", NAME:="something"
+KERNEL=="sda", ATTR{nofile}!="", NAME:="not-empty"
+KERNEL=="sda", ATTR{nofile}=="", NAME:="empty"
+KERNEL=="sda", ATTR{nofile}!="?*", NAME:="not-something"
+KERNEL=="sda", TEST!="nofile", NAME:="non-existent"
+KERNEL=="sda", NAME="wrong"
 EOF
 	},
 	{
@@ -1024,7 +1059,7 @@ EOF
 		not_exp_name	=> "node",
 		exp_add_error	=> "yes",
 		rules		=> <<EOF
-SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="node", OPTIONS="ignore"
+SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="node", OPTIONS="ignore_device"
 EOF
 	},
 	{
@@ -1411,6 +1446,17 @@ EOF
 		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
+	},
+	{
+		desc		=> "test empty NAME (empty override)",
+		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	=> "wrong",
 		exp_add_error	=> "yes",
 		rules		=> <<EOF
@@ -1419,7 +1465,7 @@ KERNEL=="ttyACM[0-9]*", NAME=""
 EOF
 	},
 	{
-		desc		=> "test empty NAME 2",
+		desc		=> "test empty NAME (non-empty override)",
 		subsys		=> "tty",
 		devpath		=> "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
 		exp_name	=> "right",
@@ -1585,16 +1631,6 @@ EOF
 		rules		=> <<EOF
 TEST=="/etc/hosts", NAME="there"
 TEST!="/etc/hosts", NAME="notthere"
-EOF
-	},
-	{
-		desc		=> "TEST invalid NAME= only (skip invalid rule)",
-		subsys		=> "block",
-		devpath		=> "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
-		exp_name	=> "yes",
-		rules		=> <<EOF
-SUBSYSTEM=="block", NAME="yes"
-NAME="no"
 EOF
 	},
 	{
@@ -1656,7 +1692,18 @@ KERNEL=="sda", MODE="440"
 KERNEL=="sda", PROGRAM=="/bin/echo 0 0 0400letsdoabuffferoverflow0123456789012345789012345678901234567890", OWNER="%c{1}", GROUP="%c{2}", MODE="%c{3}"
 EOF
 	},
-
+	{
+		desc		=> "magic [subsys/sysname] attribute substitution",
+		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",
+		rules		=> <<EOF
+KERNEL=="sda", PROGRAM="/bin/true create-envp"
+KERNEL=="sda", ENV{TESTENV}="change-envp"
+KERNEL=="sda", NAME="%k-%s{[dmi/id]product_name}-end", RUN+="socket:@/org/kernel/udev/monitor"
+EOF
+	},
 );
 
 # set env
@@ -1798,19 +1845,20 @@ sub run_test {
 
 
 	udev("add", $rules->{subsys}, $rules->{devpath}, \$rules->{rules});
+	if (defined($rules->{not_exp_name})) {
+		if ((-e "$PWD/$udev_root$rules->{not_exp_name}") ||
+		    (-l "$PWD/$udev_root$rules->{not_exp_name}")) {
+			print "nonexistent: error \'$rules->{not_exp_name}\' not expected to be there\n";
+			$error++
+		}
+	}
+
 	if ((-e "$PWD/$udev_root$rules->{exp_name}") ||
 	    (-l "$PWD/$udev_root$rules->{exp_name}")) {
 
 		my ($dev, $ino, $mode, $nlink, $uid, $gid, $rdev, $size,
 		    $atime, $mtime, $ctime, $blksize, $blocks) = stat("$PWD/$udev_root$rules->{exp_name}");
 
-		if (defined($rules->{not_exp_name})) {
-			if ((-e "$PWD/$udev_root$rules->{not_exp_name}") ||
-			    (-l "$PWD/$udev_root$rules->{not_exp_name}")) {
-				print "nonexistent: error \'$rules->{not_exp_name}\' not expected to be there\n";
-				$error++
-			}
-		}
 		if (defined($rules->{exp_perms})) {
 			permissions_test($rules, $uid, $gid, $mode);
 		}