X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=test%2Flabel_test;h=b99a4acd54b4cbee689abdbdea62b874fbd7385e;hb=0bcdc8498cdeaaef37444d38f39a19ff9557914d;hp=c33393743434fd752c3319b583894c9b4996ace1;hpb=72ffa78debb1f96488b5e13d3151486563b460e7;p=elogind.git

diff --git a/test/label_test b/test/label_test
index c33393743..b99a4acd5 100644
--- a/test/label_test
+++ b/test/label_test
@@ -8,7 +8,8 @@ export SYSFS_PATH=$PWD/sys/
 export UDEV_CONFIG_FILE=$PWD/$CONFIG
 
 cat > $RULES << EOF
-LABEL, BUS="scsi", vendor="IBM-ESXS", NAME="boot_disk%n"
+BUS="scsi", SYSFS{vendor}="IBM-ESXS", SYSFS{model}="ST336605LW   !#", NAME="boot_diskX%n"
+BUS="scsi", SYSFS{vendor}="IBM-ESXS", SYSFS{model}="ST336605LW    !#", NAME="boot_disk%n"
 EOF
 
 cat > $CONFIG << EOF
@@ -18,28 +19,31 @@ udev_rules="$PWD/$RULES"
 udev_permissions="$PWD/udev.permissions"
 EOF
 
+mkdir udev
+
 export ACTION=add
 export DEVPATH=block/sda
 
 ../udev block
-ls udev
+ls -l udev
 
 export DEVPATH=block/sda/sda3
 
 ../udev block
-ls udev
+ls -l udev
 
 export ACTION=remove
 export DEVPATH=block/sda
 
 ../udev block
-ls udev
+ls -l udev
 
 export DEVPATH=block/sda/sda3
 
 ../udev block
-ls udev
+ls -l udev
 
 
 rm $RULES
 rm $CONFIG
+rm -rf udev