X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=test%2Fudev-test.pl;h=5f9c0cb9c503a46f56660e4d1082d61e0daf9a4f;hb=3f930093f9ac79dca6bcc2dcbc8714c143709478;hp=bc8c4560d35558fbbb0ed28833c39421406f1bf5;hpb=87da5b2c65e0a889093c27189212505328aea4ab;p=elogind.git

diff --git a/test/udev-test.pl b/test/udev-test.pl
index bc8c4560d..5f9c0cb9c 100644
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -14,14 +14,8 @@
 # After creation and removal the result is checked against the
 # expected value and the result is printed.
 #
-# happy testing,
 # Kay Sievers <kay.sievers@vrfy.org>, 2003
-#
-# Modified April 9, 2004 by Leann Ogasawara <ogasawara@osdl.org>
-#  - expanded @tests array to add more symlinks and permissions tests
-#  - some of the symlinks tests also test lack of node creation
-#  - added symlink_test() function
-#  - moved permissions and major_minor tests into their own functions
+# Leann Ogasawara <ogasawara@osdl.org>, 2004
 
 use warnings;
 use strict;
@@ -619,6 +613,46 @@ EOF
 		exp_perms	=> "5000:100:0777",
 		conf		=> <<EOF
 KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", OWNER="5000", GROUP="100", MODE="0777"
+EOF
+	},
+	{
+		desc		=> "permissions only rule",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/ttyUSB0",
+		exp_name	=> "ttyUSB0",
+		exp_perms	=> "5000:100:0777",
+		conf		=> <<EOF
+KERNEL="ttyUSB[0-9]*", OWNER="5000", GROUP="100", MODE="0777"
+KERNEL="ttyUSX[0-9]*", OWNER="5001", GROUP="101", MODE="0444"
+KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n"
+EOF
+	},
+	{
+		desc		=> "multiple permissions only rule",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/ttyUSB0",
+		exp_name	=> "ttyUSB0",
+		exp_perms	=> "3000:4000:0777",
+		conf		=> <<EOF
+SUBSYSTEM="tty", OWNER="3000"
+SUBSYSTEM="tty", GROUP="4000"
+SUBSYSTEM="tty", MODE="0777"
+KERNEL="ttyUSX[0-9]*", OWNER="5001", GROUP="101", MODE="0444"
+KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n"
+EOF
+	},
+	{
+		desc		=> "permissions only rule with override at NAME rule",
+		subsys		=> "tty",
+		devpath		=> "/class/tty/ttyUSB0",
+		exp_name	=> "ttyUSB0",
+		exp_perms	=> "3000:8000:0777",
+		conf		=> <<EOF
+SUBSYSTEM="tty", OWNER="3000"
+SUBSYSTEM="tty", GROUP="4000"
+SUBSYSTEM="tty", MODE="0777"
+KERNEL="ttyUSX[0-9]*", OWNER="5001", GROUP="101", MODE="0444"
+KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", GROUP="8000"
 EOF
 	},
 	{
@@ -928,7 +962,7 @@ KERNEL="sda", NAME="cdrom%e"
 EOF
 	},
 	{
-		desc		=> "enumeration char test sequence (1/5 keep)",
+		desc		=> "enumeration char test sequence 1/5 (keep)",
 		subsys		=> "block",
 		devpath		=> "/block/sda",
 		exp_name	=> "cdrom",
@@ -984,6 +1018,37 @@ EOF
 		exp_name	=> "cdrom",
 		conf		=> <<EOF
 KERNEL="sda", NAME="cdrom%e"
+EOF
+	},
+	{
+		desc		=> "ignore rule test",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "node",
+		exp_error	=> "yes",
+		conf		=> <<EOF
+BUS="scsi", KERNEL="sda", NAME="node", OPTIONS="ignore"
+EOF
+	},
+	{
+		desc		=> "all_partitions, option-only rule",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "node6",
+		conf		=> <<EOF
+SUBSYSTEM="block", OPTIONS="all_partitions"
+BUS="scsi", KERNEL="sda", NAME="node"
+EOF
+	},
+	{
+		desc		=> "all_partitions, option-only rule (fail on partition)",
+		subsys		=> "block",
+		devpath		=> "/block/sda/sda1",
+		exp_name	=> "node6",
+		exp_error	=> "yes",
+		conf		=> <<EOF
+SUBSYSTEM="block", OPTIONS="all_partitions"
+BUS="scsi", KERNEL="sda", NAME="node"
 EOF
 	},
 	{
@@ -993,7 +1058,7 @@ EOF
 		exp_name	=> "node",
 		exp_error	=> "yes",
 		conf		=> <<EOF
-BUS="scsi", KERNEL="sda", NAME{ignore_remove}="node"
+BUS="scsi", KERNEL="sda", NAME="node", OPTIONS="ignore_remove"
 EOF
 	},
 	{
@@ -1004,7 +1069,7 @@ EOF
 		exp_error	=> "yes",
 		option		=> "clear",
 		conf		=> <<EOF
-BUS="scsi", KERNEL="sda", NAME{ignore_remove, all_partitions}="node"
+BUS="scsi", KERNEL="sda", NAME="node", OPTIONS="ignore_remove, all_partitions"
 EOF
 	},
 	{
@@ -1026,6 +1091,54 @@ EOF
 		conf		=> <<EOF
 BUS="scsi", KERNEL="sda", NAME="should_not_match", DRIVER="sd-wrong"
 BUS="scsi", KERNEL="sda", NAME="node", DRIVER="sd"
+EOF
+	},
+	{
+		desc		=> "temporary node creation test",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "node",
+		conf		=> <<EOF
+BUS="scsi", KERNEL="sda", PROGRAM="/usr/bin/test -b %N" NAME="node"
+EOF
+	},
+	{
+		desc		=> "devpath substitution test",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "sda",
+		conf		=> <<EOF
+BUS="scsi", KERNEL="sda", PROGRAM="/bin/echo %p", RESULT="/block/sda" NAME="%k"
+EOF
+	},
+	{
+		desc		=> "parent node name substitution test sequence 1/2 (keep)",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "main_device",
+		option		=> "keep",
+		conf		=> <<EOF
+BUS="scsi", KERNEL="sda", NAME="main_device"
+EOF
+	},
+	{
+		desc		=> "parent node name substitution test sequence 2/2 (clean)",
+		subsys		=> "block",
+		devpath		=> "/block/sda/sda1",
+		exp_name	=> "main_device-part-1",
+		option		=> "clean",
+		conf		=> <<EOF
+BUS="scsi", KERNEL="sda1", NAME="%P-part-1"
+EOF
+	},
+	{
+		desc		=> "udev_root substitution",
+		subsys		=> "block",
+		devpath		=> "/block/sda/sda1",
+		exp_name	=> "start-udev-root-end",
+		option		=> "clean",
+		conf		=> <<EOF
+BUS="scsi", KERNEL="sda1", NAME="start-%r-end"
 EOF
 	},
 );
@@ -1215,9 +1328,6 @@ 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 "default_mode=\"0660\"\n";
-print CONF "default_owner=\"root\"\n";
-print CONF "default_group=\"root\"\n";
 close CONF;
 
 my $test_num = 1;