X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=test%2Flabel_test;h=b99a4acd54b4cbee689abdbdea62b874fbd7385e;hp=0bf89226cbd4244248f16ae7729dca04162e64c7;hb=a6150f4a8a45b0d53162b92e574f53a01d94c432;hpb=1ac5204774c4080d16f308ac3077db0dae8d221c

diff --git a/test/label_test b/test/label_test
index 0bf89226c..b99a4acd5 100644
--- a/test/label_test
+++ b/test/label_test
@@ -1,33 +1,49 @@
 #!/bin/bash
 
+RULES=label_test.rules
+CONFIG=label_test.conf
+
 export UDEV_TEST=yes
 export SYSFS_PATH=$PWD/sys/
-export UDEV_CONFIG_DIR=$PWD/
-export UDEV_ROOT=$PWD/udev/
-export UDEV_DB=udev.tdb
-export UDEV_CONFIG_FILE=label_test.config
-export UDEV_PERMISSION_FILE=udev.permissions
+export UDEV_CONFIG_FILE=$PWD/$CONFIG
+
+cat > $RULES << EOF
+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
+udev_root="$PWD/udev/"
+udev_db="$PWD/udev/.udev.tdb"
+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