X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=test%2Fudev-test.pl;h=47cadc5db35768f64f6a3165d90cdf291ba4d414;hb=9dae0e89b9d2138e028c2a69170ba2a96503b766;hp=30e8d2ac1088447c120e27b994a6ccee667fa81c;hpb=065db052211d3bf08d9b0f698a79a8798faf11d2;p=elogind.git

diff --git a/test/udev-test.pl b/test/udev-test.pl
index 30e8d2ac1..47cadc5db 100755
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -21,8 +21,8 @@ use warnings;
 use strict;
 
 my $PWD			= $ENV{PWD};
-my $sysfs		= "sys/";
-my $udev_bin		= "../udev/test-udev";
+my $sysfs		= "test/sys/";
+my $udev_bin		= "udev/test-udev";
 my $valgrind		= 0;
 my $udev_bin_valgrind	= "valgrind --tool=memcheck --leak-check=yes --quiet $udev_bin";
 my $udev_root		= "udev-root/";
@@ -819,9 +819,9 @@ EOF
 		subsys		=> "tty",
 		devpath		=> "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
 		exp_name	=> "symlink2-ttyACM0",
-		exp_target	=> "ttyACM0",
+		exp_target	=> "ttyACM-0",
 		rules		=> <<EOF
-KERNEL=="ttyACM[0-9]*", NAME="ttyACM%n", SYMLINK="symlink1-%n symlink2-%k symlink3-%b"
+KERNEL=="ttyACM[0-9]*", NAME="ttyACM-%n", SYMLINK="symlink1-%n symlink2-%k symlink3-%b"
 EOF
 	},
 	{
@@ -1524,8 +1524,9 @@ KERNEL=="sda1", GOTO="TEST"
 KERNEL=="sda1", NAME="wrong"
 KERNEL=="sda1", GOTO="BAD"
 KERNEL=="sda1", NAME="", LABEL="NO"
-KERNEL=="sda1", NAME="right", LABEL="TEST"
-KERNEL=="sda1", LABEL="BAD"
+KERNEL=="sda1", NAME="right", LABEL="TEST", GOTO="end"
+KERNEL=="sda1", NAME="wrong2", LABEL="BAD"
+LABEL="end"
 EOF
 	},
 	{
@@ -1654,14 +1655,14 @@ KERNEL=="sda", MODE="0000"
 EOF
 	},
 	{
-		desc		=> "TEST PROGRAM feeds MODE",
+		desc		=> "TEST PROGRAM feeds OWNER, GROUP, MODE",
 		subsys		=> "block",
 		devpath		=> "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
 		exp_name	=> "sda",
-		exp_perms	=> "0:0:0400",
+		exp_perms	=> "5000:100:0400",
 		rules		=> <<EOF
 KERNEL=="sda", MODE="666"
-KERNEL=="sda", PROGRAM=="/bin/echo 0 0 0400", OWNER="%c{1}", GROUP="%c{2}", MODE="%c{3}"
+KERNEL=="sda", PROGRAM=="/bin/echo 5000 100 0400", OWNER="%c{1}", GROUP="%c{2}", MODE="%c{3}"
 EOF
 	},
 	{