X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=test%2Fudev-test.pl;h=2549c7ee69ac4f6862f75c851d4d7c726caa471a;hb=53899a171ea862124b49c75b7511b7eb30742ef9;hp=e7c00e29e6e08e0bd855fd746a70071dafb4a512;hpb=764ce7f2ab526c084f005186e0dcbabe59070247;p=elogind.git

diff --git a/test/udev-test.pl b/test/udev-test.pl
index e7c00e29e..2549c7ee6 100755
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -262,9 +262,9 @@ EOF
 		desc		=> "import of shell-value file",
 		subsys		=> "block",
 		devpath		=> "/block/sda",
-		exp_name	=> "subdir/sys/node" ,
+		exp_name	=> "subdir/info/node" ,
 		rules		=> <<EOF
-BUS=="scsi", IMPORT{file}="test.all", NAME="subdir%E{SYSFSDIR}/node"
+BUS=="scsi", IMPORT{file}="udev-test.conf", NAME="subdir/%E{udev_log}/node"
 KERNEL=="ttyUSB0", NAME="visor"
 EOF
 	},
@@ -1342,7 +1342,7 @@ EOF
 		devpath		=> "/block/sda/sda1",
 		exp_name	=> "replaced",
 		rules		=> <<EOF
-BUS=="scsi", KERNEL=="sda1", PROGRAM=="/bin/echo -e \\xef\\xe8garbage", RESULT=="[?][?]garbage", NAME="replaced"
+BUS=="scsi", KERNEL=="sda1", PROGRAM=="/bin/echo -e \\xef\\xe8garbage", RESULT=="__garbage", NAME="replaced"
 EOF
 	},
 	{
@@ -1763,6 +1763,7 @@ open CONF, ">$udev_conf" || die "unable to create config file: $udev_conf";
 print CONF "udev_root=\"$udev_root\"\n";
 print CONF "udev_db=\"$udev_db\"\n";
 print CONF "udev_rules=\"$udev_rules\"\n";
+print CONF "udev_log=\"info\"\n";
 close CONF;
 
 my $test_num = 1;