X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=test%2Fudev-test.pl;h=97c009492124005ae641c5c38fe4bf56b4df56f1;hb=3310f9d0e8a585c4b96d558a34b06b47699586b1;hp=4773954b9cef9ce9a6b81e1fcf47b1bfaeac8d8b;hpb=358c8c20239a314b4684c54485c526deaf36dd3b;p=elogind.git

diff --git a/test/udev-test.pl b/test/udev-test.pl
index 4773954b9..97c009492 100644
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -212,6 +212,46 @@ EOF
 		expected => "link1" ,
 		conf     => <<EOF
 CALLOUT, BUS="scsi", PROGRAM="/bin/echo -n node link1 link2", ID="node *", NAME="%1c", SYMLINK="%2c %3c"
+EOF
+	},
+	{
+		desc     => "invalid callout for device with no bus",
+		subsys   => "tty",
+		devpath  => "class/tty/console",
+		expected => "TTY" ,
+		conf     => <<EOF
+CALLOUT, BUS="scsi", PROGRAM="/bin/echo -n foo", ID="foo", NAME="foo"
+REPLACE, KERNEL="console", NAME="TTY"
+EOF
+	},
+	{
+		desc     => "valid callout for device with no bus",
+		subsys   => "tty",
+		devpath  => "class/tty/console",
+		expected => "foo" ,
+		conf     => <<EOF
+CALLOUT, PROGRAM="/bin/echo -n foo", ID="foo", NAME="foo"
+REPLACE, KERNEL="console", NAME="TTY"
+EOF
+	},
+	{
+		desc     => "invalid label for device with no bus",
+		subsys   => "tty",
+		devpath  => "class/tty/console",
+		expected => "TTY" ,
+		conf     => <<EOF
+LABEL, BUS="foo", SYSFS_dev="5:1", NAME="foo"
+REPLACE, KERNEL="console", NAME="TTY"
+EOF
+	},
+	{
+		desc     => "valid label for device with no bus",
+		subsys   => "tty",
+		devpath  => "class/tty/console",
+		expected => "foo" ,
+		conf     => <<EOF
+LABEL, SYSFS_dev="5:1", NAME="foo"
+REPLACE, KERNEL="console", NAME="TTY"
 EOF
 	},
 	{
@@ -328,7 +368,7 @@ 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";