X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=test%2Fudev-test.pl;h=1a35e3da82e446be17c0b5f52ff64ccd35b79181;hp=613aa792d433f8bbf6cb29ff608e9de5245eaa17;hb=b1c5e3339deb97f4a30053111b444489a3bc9562;hpb=e5fbfe0a13e11c08ed72b67fa4e72a93bcd5de37

diff --git a/test/udev-test.pl b/test/udev-test.pl
index 613aa792d..1a35e3da8 100644
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -21,15 +21,14 @@
 use warnings;
 use strict;
 
-my $PWD = `pwd`;
-chomp($PWD);
-
+my $PWD = $ENV{PWD};
 my $sysfs     = "sys/";
 my $udev_bin  = "../udev";
 my $udev_root = "udev-root/"; # !!! directory will be removed !!!
-my $udev_db   = "udev.tdb";
+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 = (
@@ -40,7 +39,7 @@ my @tests = (
 		expected => "boot_disk" ,
 		conf     => <<EOF
 LABEL, BUS="scsi", vendor="IBM-ESXS", NAME="boot_disk%n"
-REPLACE, KERNEL="ttyUSB0", NAME="visor""
+REPLACE, KERNEL="ttyUSB0", NAME="visor"
 EOF
 	},
 	{
@@ -50,6 +49,49 @@ EOF
 		expected => "boot_disk1" ,
 		conf     => <<EOF
 LABEL, BUS="scsi", 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", vendor="?IBM-ESXS", NAME="boot_disk%n-1"
+LABEL, BUS="scsi", vendor="IBM-ESXS?", NAME="boot_disk%n-2"
+LABEL, BUS="scsi", vendor="IBM-ES??", NAME="boot_disk%n"
+LABEL, BUS="scsi", vendor="IBM-ESXSS", NAME="boot_disk%n-3"
+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
 	},
 	{
@@ -59,6 +101,15 @@ EOF
 		expected => "visor" ,
 		conf     => <<EOF
 REPLACE, KERNEL="ttyUSB0", NAME="visor"
+EOF
+	},
+	{
+		desc     => "subdirectory handling",
+		subsys   => "tty",
+		devpath  => "class/tty/ttyUSB0",
+		expected => "sub/direct/ory/visor" ,
+		conf     => <<EOF
+REPLACE, KERNEL="ttyUSB0", NAME="sub/direct/ory/visor"
 EOF
 	},
 	{
@@ -80,7 +131,7 @@ TOPOLOGY, BUS="scsi", PLACE="0:0:0:0", NAME="Major:%M:minor:%m:kernelnumber:%n:b
 EOF
 	},
 	{
-		desc     => "callout result subtitution, only last should match",
+		desc     => "callout result substitution",
 		subsys   => "block",
 		devpath  => "block/sda/sda3",
 		expected => "special-device-3" ,
@@ -90,6 +141,98 @@ CALLOUT, BUS="scsi", PROGRAM="/bin/echo -n special-device", ID="special--*", NAM
 CALLOUT, BUS="scsi", PROGRAM="/bin/echo -n special-device", ID="special-device-", NAME="%c-3-%n"
 CALLOUT, BUS="scsi", PROGRAM="/bin/echo -n special-device", ID="special-devic", NAME="%c-4-%n"
 CALLOUT, BUS="scsi", PROGRAM="/bin/echo -n special-device", ID="special-*", NAME="%c-%n"
+EOF
+	},
+	{
+		desc     => "callout program substitution",
+		subsys   => "block",
+		devpath  => "block/sda/sda3",
+		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/disc" ,
+		conf     => <<EOF
+LABEL, BUS="scsi", vendor="IBM-ESXS", NAME="lun0/%D"
+EOF
+	},
+	{
+		desc     => "devfs disk naming substitution",
+		subsys   => "block",
+		devpath  => "block/sda/sda2",
+		expected => "lun0/part2" ,
+		conf     => <<EOF
+LABEL, BUS="scsi", vendor="IBM-ESXS", NAME="lun0/%D"
+EOF
+	},
+	{
+		desc     => "callout bus type",
+		subsys   => "block",
+		devpath  => "block/sda",
+		expected => "scsi-0:0:0:0" ,
+		conf     => <<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", 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", 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", 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
 	},
 );
@@ -97,17 +240,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_CONFIG_FILE} = $conf_tmp;
 
 	# create temporary config
 	open CONF, ">$conf_tmp" || die "unable to create config file: $conf_tmp";
@@ -127,6 +266,14 @@ 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]*).*/;
 	my $method  = $1;
@@ -142,11 +289,11 @@ foreach my $config (@tests) {
 		system("tree $udev_root");
 		print "\n";
 		$error++;
-#		next;
 	}
 
 	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++;
@@ -158,7 +305,8 @@ foreach my $config (@tests) {
 print "$error errors occured\n\n";
 
 # cleanup
+unlink($udev_db);
 system("rm -rf $udev_root");
 unlink($conf_tmp);
-unlink($udev_db);
+unlink($main_conf);