X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=test%2Fudev-test.pl;h=ad551dd042d8966f5f3ebd8558ddb9afd1506703;hp=1117ecb40c99b82657520409206e92f5391de2c3;hb=e231a5db51f1b21252b2404d0aa2f243baa87a1a;hpb=c4edd0adb55ebf625a0f190071b930b469c58dd8

diff --git a/test/udev-test.pl b/test/udev-test.pl
index 1117ecb40..ad551dd04 100755
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -22,8 +22,8 @@ use strict;
 
 my $PWD		= $ENV{PWD};
 my $sysfs	= "sys/";
-my $udev_bin	= "../udev";
-my $udev_root	= "udev-root/"; # !!! directory will be removed !!!
+my $udev_bin	= "../udev/test-udev";
+my $udev_root	= "udev-root/";
 my $udev_conf	= "udev-test.conf";
 my $udev_rules	= "udev-test.rules";
 
@@ -302,7 +302,7 @@ EOF
 		devpath		=> "/block/sda",
 		exp_name	=> "node12345678",
 		rules		=> <<EOF
-SUBSYSTEMS=="scsi", IMPORT="/bin/echo -e \' TEST_KEY=12345678  \\n  TEST_key2=98765 \'", NAME="node\$env{TEST_KEY}"
+SUBSYSTEMS=="scsi", IMPORT="/bin/echo -e \' TEST_KEY=12345678\\n  TEST_key2=98765\'", NAME="node\$env{TEST_KEY}"
 KERNEL=="ttyUSB0", NAME="visor"
 EOF
 	},
@@ -579,6 +579,24 @@ EOF
 		rules		=> <<EOF
 SUBSYSTEMS=="scsi", KERNELS=="*:0:0:0", NAME="scsi-0:0:0:0"
 SUBSYSTEMS=="scsi", KERNELS=="0:0:0:0", NAME="bad"
+EOF
+	},
+	{
+		desc		=> "substitute attr with link target value (first match)",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "driver-is-sd",
+		rules		=> <<EOF
+SUBSYSTEMS=="scsi", NAME="driver-is-\$attr{driver}"
+EOF
+	},
+	{
+		desc		=> "substitute attr with link target value (currently selected device)",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "driver-is-aic7xxx",
+		rules		=> <<EOF
+SUBSYSTEMS=="pci", NAME="driver-is-\$attr{driver}"
 EOF
 	},
 	{
@@ -997,26 +1015,6 @@ EOF
 		exp_target	=> "ttyUSB0",
 		rules		=> <<EOF
 KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK+="%3s{dev}"
-EOF
-	},
-	{
-		desc		=> "symlink with '%' in name",
-		subsys		=> "tty",
-		devpath		=> "/class/tty/ttyUSB0",
-		exp_name	=> "percent%sign",
-		exp_target	=> "ttyUSB0",
-		rules		=> <<EOF
-KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK+="percent%%sign"
-EOF
-	},
-	{
-		desc		=> "symlink with '%' in name",
-		subsys		=> "tty",
-		devpath		=> "/class/tty/ttyUSB0",
-		exp_name	=> "%ttyUSB0_name",
-		exp_target	=> "ttyUSB0",
-		rules		=> <<EOF
-KERNEL=="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK+="%%%k_name"
 EOF
 	},
 	{
@@ -1245,6 +1243,19 @@ SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ASSIGN}="true"
 SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ASSIGN}=="yes", NAME="no"
 SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ASSIGN}=="true", NAME="true"
 SUBSYSTEMS=="scsi", KERNEL=="sda1", NAME="bad"
+EOF
+	},
+	{
+		desc		=> "ENV{} test (assign 2 times)",
+		subsys		=> "block",
+		devpath		=> "/block/sda/sda1",
+		exp_name	=> "true",
+		rules		=> <<EOF
+SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ASSIGN}="true"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ASSIGN}="absolutely-\$env{ASSIGN}"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ASSIGN}=="yes", NAME="no"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ASSIGN}=="absolutely-true", NAME="true"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", NAME="bad"
 EOF
 	},
 	{
@@ -1525,8 +1536,17 @@ EOF
 		devpath		=> "/block/sda/sda1",
 		exp_name	=> "yes",
 		rules		=> <<EOF
-KERNEL="sda1", NAME=="no"
+KERNEL="sda1", NAME="no"
 KERNEL=="sda1", NAME="yes"
+EOF
+	},
+	{
+		desc		=> "operator chars in attribute",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "yes",
+		rules		=> <<EOF
+KERNEL=="sda", ATTR{test:colon+plus}=="?*", NAME="yes"
 EOF
 	},
 	{
@@ -1541,6 +1561,83 @@ KERNEL="sda1", NAME=="no"
 KERNEL=="sda1", NAME="yes"
 EOF
 	},
+	{
+		desc		=> "magic subsys/kernel lookup",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "00:e0:00:fb:04:e1",
+		rules		=> <<EOF
+KERNEL=="sda", NAME="\$attr{[net/eth0]address}"
+EOF
+	},
+	{
+		desc		=> "TEST absolute path",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "there",
+		rules		=> <<EOF
+TEST=="/etc/hosts", NAME="there"
+NAME="notthere"
+EOF
+	},
+	{
+		desc		=> "TEST subsys/kernel lookup",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "yes",
+		rules		=> <<EOF
+KERNEL=="sda", TEST=="[net/eth0]", NAME="yes"
+EOF
+	},
+	{
+		desc		=> "TEST relative path",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "relative",
+		rules		=> <<EOF
+KERNEL=="sda", TEST=="size", NAME="relative"
+EOF
+	},
+	{
+		desc		=> "TEST wildcard substitution (find queue/nr_requests)",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "found-subdir",
+		rules		=> <<EOF
+KERNEL=="sda", TEST=="*/nr_requests", NAME="found-subdir"
+EOF
+	},
+	{
+		desc		=> "TEST MODE=0000",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "sda",
+		exp_perms	=> "0:0:0000",
+		rules		=> <<EOF
+KERNEL=="sda", MODE="0000"
+EOF
+	},
+	{
+		desc		=> "TEST PROGRAM feeds MODE",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "sda",
+		exp_perms	=> "0:0:0400",
+		rules		=> <<EOF
+KERNEL=="sda", PROGRAM=="/bin/echo 0 0 0400", OWNER="%c{1}", GROUP="%c{2}", MODE="%c{3}"
+EOF
+	},
+	{
+		desc		=> "TEST PROGRAM feeds MODE with overflow",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "sda",
+		exp_perms	=> "0:0:0400",
+		rules		=> <<EOF
+KERNEL=="sda", PROGRAM=="/bin/echo 0 0 0400letsdoabuffferoverflow0123456789012345789012345678901234567890", OWNER="%c{1}", GROUP="%c{2}", MODE="%c{3}"
+EOF
+	},
+
 );
 
 # set env
@@ -1656,6 +1753,15 @@ sub symlink_test {
 	}
 }
 
+sub make_udev_root {
+	system("rm -rf $udev_root");
+	mkdir($udev_root) || die "unable to create udev_root: $udev_root\n";
+	# setting group and mode of udev_root ensures the tests work
+	# even if the parent directory has setgid bit enabled.
+	chown (0, 0, $udev_root) || die "unable to chown $udev_root\n";
+	chmod (0755, $udev_root) || die "unable to chmod $udev_root\n";
+}
+
 sub run_test {
 	my ($rules, $number) = @_;
 
@@ -1728,8 +1834,7 @@ sub run_test {
 	print "\n";
 
 	if (defined($rules->{option}) && $rules->{option} eq "clean") {
-		system("rm -rf $udev_root");
-		mkdir($udev_root) || die "unable to create udev_root: $udev_root\n";
+		make_udev_root ();
 	}
 
 }
@@ -1742,13 +1847,12 @@ if (!($<==0)) {
 }
 
 # prepare
-system("rm -rf $udev_root");
-mkdir($udev_root) || die "unable to create udev_root: $udev_root\n";
+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_rules=\"$udev_rules\"\n";
+print CONF "udev_rules=\"$PWD\"\n";
 print CONF "udev_log=\"info\"\n";
 close CONF;