X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=test%2Fudev-test.pl;h=3e7068faa6d84f0d3643b09a19ee7117375e2c22;hp=8af09a027b99555f372fd713528bd92b3718f4e4;hb=5cac7def788fc6dec19dc8185f9c2c7c7c8d49a2;hpb=fd9594b61fb5ac4106731c087af614940b066df4

diff --git a/test/udev-test.pl b/test/udev-test.pl
index 8af09a027..3e7068faa 100644
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -27,7 +27,8 @@ my $udev_bin  = "../udev";
 my $udev_root = "udev-root/"; # !!! directory will be removed !!!
 my $udev_db   = ".udev.tdb";
 my $perm      = "udev.permissions";
-my $conf_tmp  = "udev-test.config";
+my $main_conf = "udev-test.conf";
+my $conf_tmp  = "udev-test.rules";
 
 
 my @tests = (
@@ -37,8 +38,8 @@ my @tests = (
 		devpath  => "block/sda",
 		expected => "boot_disk" ,
 		conf     => <<EOF
-LABEL, BUS="scsi", vendor="IBM-ESXS", NAME="boot_disk%n"
-REPLACE, KERNEL="ttyUSB0", NAME="visor""
+LABEL, BUS="scsi", SYSFS_vendor="IBM-ESXS", NAME="boot_disk%n"
+REPLACE, KERNEL="ttyUSB0", NAME="visor"
 EOF
 	},
 	{
@@ -47,16 +48,70 @@ EOF
 		devpath  => "block/sda/sda1",
 		expected => "boot_disk1" ,
 		conf     => <<EOF
-LABEL, BUS="scsi", vendor="IBM-ESXS", NAME="boot_disk%n"
+LABEL, BUS="scsi", SYSFS_vendor="IBM-ESXS", NAME="boot_disk%n"
+EOF
+	},
+	{
+		desc     => "label test of pattern match",
+		subsys   => "block",
+		devpath  => "block/sda/sda1",
+		expected => "boot_disk1" ,
+		conf     => <<EOF
+LABEL, BUS="scsi", SYSFS_vendor="?IBM-ESXS", NAME="boot_disk%n-1"
+LABEL, BUS="scsi", SYSFS_vendor="IBM-ESXS?", NAME="boot_disk%n-2"
+LABEL, BUS="scsi", SYSFS_vendor="IBM-ES??", NAME="boot_disk%n"
+LABEL, BUS="scsi", SYSFS_vendor="IBM-ESXSS", NAME="boot_disk%n-3"
+EOF
+	},
+	{
+		desc     => "label test of multiple sysfs files",
+		subsys   => "block",
+		devpath  => "block/sda/sda1",
+		expected => "boot_disk1" ,
+		conf     => <<EOF
+LABEL, BUS="scsi", SYSFS_vendor="IBM-ESXS", SYSFS_model="ST336605LW   !#", NAME="boot_diskX%n"
+LABEL, BUS="scsi", SYSFS_vendor="IBM-ESXS", SYSFS_model="ST336605LW    !#", NAME="boot_disk%n"
 EOF
 	},
 	{
-		desc     => "catch device by wildcard",
+		desc     => "label test of max sysfs files",
+		subsys   => "block",
+		devpath  => "block/sda/sda1",
+		expected => "boot_disk1" ,
+		conf     => <<EOF
+LABEL, BUS="scsi", SYSFS_vendor="IBM-ESXS", SYSFS_model="ST336605LW    !#", SYSFS_scsi_level="4", SYSFS_rev="B245", SYSFS_type="2", SYSFS_queue_depth="32", NAME="boot_diskXX%n"
+LABEL, BUS="scsi", SYSFS_vendor="IBM-ESXS", SYSFS_model="ST336605LW    !#", SYSFS_scsi_level="4", SYSFS_rev="B245", SYSFS_type="0", NAME="boot_disk%n"
+EOF
+	},
+	{
+		desc     => "catch device by *",
 		subsys   => "tty",
 		devpath  => "class/tty/ttyUSB0",
 		expected => "visor/0" ,
 		conf     => <<EOF
 REPLACE, KERNEL="ttyUSB*", NAME="visor/%n"
+EOF
+	},
+	{
+		desc     => "catch device by ?",
+		subsys   => "tty",
+		devpath  => "class/tty/ttyUSB0",
+		expected => "visor/0" ,
+		conf     => <<EOF
+REPLACE, KERNEL="ttyUSB??*", NAME="visor/%n-1"
+REPLACE, KERNEL="ttyUSB??", NAME="visor/%n-2"
+REPLACE, KERNEL="ttyUSB?", NAME="visor/%n"
+EOF
+	},
+	{
+		desc     => "catch device by character class",
+		subsys   => "tty",
+		devpath  => "class/tty/ttyUSB0",
+		expected => "visor/0" ,
+		conf     => <<EOF
+REPLACE, KERNEL="ttyUSB[A-Z]*", NAME="visor/%n-1"
+REPLACE, KERNEL="ttyUSB?[0-9]", NAME="visor/%n-2"
+REPLACE, KERNEL="ttyUSB[0-9]*", NAME="visor/%n"
 EOF
 	},
 	{
@@ -66,6 +121,39 @@ EOF
 		expected => "visor" ,
 		conf     => <<EOF
 REPLACE, KERNEL="ttyUSB0", NAME="visor"
+EOF
+	},
+	{
+		desc     => "Handle comment lines in config file (and replace kernel name)",
+		subsys   => "tty",
+		devpath  => "class/tty/ttyUSB0",
+		expected => "visor" ,
+		conf     => <<EOF
+# this is a comment
+REPLACE, KERNEL="ttyUSB0", NAME="visor"
+
+EOF
+	},
+	{
+		desc     => "Handle comment lines in config file with whitespace (and replace kernel name)",
+		subsys   => "tty",
+		devpath  => "class/tty/ttyUSB0",
+		expected => "visor" ,
+		conf     => <<EOF
+ # this is a comment with whitespace before the comment 
+REPLACE, KERNEL="ttyUSB0", NAME="visor"
+
+EOF
+	},
+	{
+		desc     => "Handle empty lines in config file (and replace kernel name)",
+		subsys   => "tty",
+		devpath  => "class/tty/ttyUSB0",
+		expected => "visor" ,
+		conf     => <<EOF
+
+REPLACE, KERNEL="ttyUSB0", NAME="visor"
+
 EOF
 	},
 	{
@@ -96,7 +184,7 @@ TOPOLOGY, BUS="scsi", PLACE="0:0:0:0", NAME="Major:%M:minor:%m:kernelnumber:%n:b
 EOF
 	},
 	{
-		desc     => "callout result substitution, only last should match",
+		desc     => "callout result substitution",
 		subsys   => "block",
 		devpath  => "block/sda/sda3",
 		expected => "special-device-3" ,
@@ -115,15 +203,24 @@ EOF
 		expected => "test-0:0:0:0" ,
 		conf     => <<EOF
 CALLOUT, BUS="scsi", PROGRAM="/bin/echo -n test-%b", ID="test-*", NAME="%c"
+EOF
+	},
+	{
+		desc     => "callout program substitution (numbered part of)",
+		subsys   => "block",
+		devpath  => "block/sda/sda3",
+		expected => "link1" ,
+		conf     => <<EOF
+CALLOUT, BUS="scsi", PROGRAM="/bin/echo -n node link1 link2", ID="node *", NAME="%1c", SYMLINK="%2c %3c"
 EOF
 	},
 	{
 		desc     => "devfs disk naming substitution",
 		subsys   => "block",
 		devpath  => "block/sda",
-		expected => "lun0/disk" ,
+		expected => "lun0/disc" ,
 		conf     => <<EOF
-LABEL, BUS="scsi", vendor="IBM-ESXS", NAME="lun0/%D"
+LABEL, BUS="scsi", SYSFS_vendor="IBM-ESXS", NAME="lun0/%D"
 EOF
 	},
 	{
@@ -132,7 +229,7 @@ EOF
 		devpath  => "block/sda/sda2",
 		expected => "lun0/part2" ,
 		conf     => <<EOF
-LABEL, BUS="scsi", vendor="IBM-ESXS", NAME="lun0/%D"
+LABEL, BUS="scsi", SYSFS_vendor="IBM-ESXS", NAME="lun0/%D"
 EOF
 	},
 	{
@@ -144,6 +241,51 @@ EOF
 CALLOUT, BUS="usb", PROGRAM="/bin/echo -n usb-%b", ID="*", NAME="%c"
 CALLOUT, BUS="scsi", PROGRAM="/bin/echo -n scsi-%b", ID="*", NAME="%c"
 CALLOUT, BUS="foo", PROGRAM="/bin/echo -n foo-%b", ID="*", NAME="%c"
+EOF
+	},
+	{
+		desc     => "symlink creation (same directory)",
+		subsys   => "tty",
+		devpath  => "class/tty/ttyUSB0",
+		expected => "visor0" ,
+		conf     => <<EOF
+REPLACE, KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", SYMLINK="visor%n"
+EOF
+	},
+	{
+		desc     => "symlink creation (relative link back)",
+		subsys   => "block",
+		devpath  => "block/sda/sda2",
+		expected => "1/2/a/b/symlink" ,
+		conf     => <<EOF
+LABEL, BUS="scsi", SYSFS_vendor="IBM-ESXS", NAME="1/2/node", SYMLINK="1/2/a/b/symlink"
+EOF
+	},
+	{
+		desc     => "symlink creation (relative link forward)",
+		subsys   => "block",
+		devpath  => "block/sda/sda2",
+		expected => "1/2/symlink" ,
+		conf     => <<EOF
+LABEL, BUS="scsi", SYSFS_vendor="IBM-ESXS", NAME="1/2/a/b/node", SYMLINK="1/2/symlink"
+EOF
+	},
+	{
+		desc     => "symlink creation (relative link back and forward)",
+		subsys   => "block",
+		devpath  => "block/sda/sda2",
+		expected => "1/2/c/d/symlink" ,
+		conf     => <<EOF
+LABEL, BUS="scsi", SYSFS_vendor="IBM-ESXS", NAME="1/2/a/b/node", SYMLINK="1/2/c/d/symlink"
+EOF
+	},
+	{
+		desc     => "multiple symlinks",
+		subsys   => "tty",
+		devpath  => "class/tty/ttyUSB0",
+		expected => "second-0" ,
+		conf     => <<EOF
+REPLACE, KERNEL="ttyUSB0", NAME="visor", SYMLINK="first-%n second-%n third-%n"
 EOF
 	},
 );
@@ -151,17 +293,13 @@ EOF
 # set env
 $ENV{UDEV_TEST} = "yes";
 $ENV{SYSFS_PATH} = $sysfs;
-$ENV{UDEV_CONFIG_DIR} = "./";
-$ENV{UDEV_ROOT} = $udev_root;
-$ENV{UDEV_DB} = $udev_db;
-$ENV{UDEV_PERMISSION_FILE} = $perm;
+$ENV{UDEV_CONFIG_FILE} = $main_conf;
 
 
 sub udev {
 	my ($action, $subsys, $devpath, $config) = @_;
 
 	$ENV{DEVPATH} = $devpath;
-	$ENV{UDEV_RULES_FILE} = $conf_tmp;
 
 	# create temporary config
 	open CONF, ">$conf_tmp" || die "unable to create config file: $conf_tmp";
@@ -181,8 +319,16 @@ mkdir($udev_root) || die "unable to create udev_root: $udev_root\n";
 my $error = 0;
 print "\nudev-test will run ".($#tests + 1)." tests:\n\n";
 
+# create initial config file
+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";
+close CONF;
+
 foreach my $config (@tests) {
-	$config->{conf} =~ m/^([A-Z]*).*/;
+	$config->{conf} =~ m/([A-Z]+)\s*,/;
 	my $method  = $1;
 
 	print "TEST: $config->{desc}\n";
@@ -199,7 +345,8 @@ foreach my $config (@tests) {
 	}
 
 	udev("remove", $config->{subsys}, $config->{devpath}, \$config->{conf});
-	if (-e "$PWD/$udev_root$config->{expected}") {
+	if ((-e "$PWD/$udev_root$config->{expected}") ||
+	    (-l "$PWD/$udev_root$config->{expected}")) {
 		print "remove: error\n\n";
 		system("tree $udev_root");
 		$error++;
@@ -214,4 +361,5 @@ print "$error errors occured\n\n";
 unlink($udev_db);
 system("rm -rf $udev_root");
 unlink($conf_tmp);
+unlink($main_conf);