[PATCH] fix up the tests to support the rules file name change

diff --git a/test/label_test b/test/label_test
index 0bf89226cbd4244248f16ae7729dca04162e64c7..b0a605cdac2cbac6ee64951a1686ce37d2f53bc7 100644 (file)
--- a/test/label_test
+++ b/test/label_test
@@ -6,6 +6,7 @@ export UDEV_CONFIG_DIR=$PWD/
 export UDEV_ROOT=$PWD/udev/
 export UDEV_DB=udev.tdb
 export UDEV_CONFIG_FILE=label_test.config
+export UDEV_RULES_FILE=label_test.rules
 export UDEV_PERMISSION_FILE=udev.permissions
 
 export ACTION=add

diff --git a/test/modifier_test b/test/modifier_test
index 3dcd4454fc62243db30b5eeb4f5f2c9e3116ea47..a028d20e4dbd3ffd2be8e847f3419f1aacfcf33f 100644 (file)
--- a/test/modifier_test
+++ b/test/modifier_test
@@ -6,6 +6,7 @@ export UDEV_CONFIG_DIR=$PWD/
 export UDEV_ROOT=$PWD/udev/
 export UDEV_DB=udev.tdb
 export UDEV_CONFIG_FILE=modifier_test.config
+export UDEV_RULES_FILE=modifier_test.rules
 export UDEV_PERMISSION_FILE=udev.permissions
 
 export ACTION=add

diff --git a/test/replace_test b/test/replace_test
index c8e54f8f8dd8336f4d315bc3d72ceed757e2f7c8..aae07b48acf9e34ecb554bbccfb57e3f1b10e62e 100644 (file)
--- a/test/replace_test
+++ b/test/replace_test
@@ -6,6 +6,7 @@ export UDEV_CONFIG_DIR=$PWD/
 export UDEV_ROOT=$PWD/udev/
 export UDEV_DB=udev.tdb
 export UDEV_CONFIG_FILE=replace_test.config
+export UDEV_RULES_FILE=replace_test.rules
 export UDEV_PERMISSION_FILE=udev.permissions
 
 export DEVPATH=class/tty/ttyUSB0

diff --git a/test/topo_test b/test/topo_test
index 2a19c8b5f82c77faa11923ea2331db0454cca9a5..71121f478e02e6c5405e4f70380def2d29380484 100644 (file)
--- a/test/topo_test
+++ b/test/topo_test
@@ -6,6 +6,7 @@ export UDEV_CONFIG_DIR=$PWD/
 export UDEV_ROOT=$PWD/udev/
 export UDEV_DB=udev.tdb
 export UDEV_CONFIG_FILE=topo_test.config
+export UDEV_RULES_FILE=topo_test.rules
 export UDEV_PERMISSION_FILE=udev.permissions
 
 export ACTION=add

diff --git a/test/udev-test.pl b/test/udev-test.pl
index 8b967c353c6e5c0364433dc786ffd702498e75dd..8af09a027b99555f372fd713528bd92b3718f4e4 100644 (file)
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -161,7 +161,7 @@ sub udev {
        my ($action, $subsys, $devpath, $config) = @_;
 
        $ENV{DEVPATH} = $devpath;
-       $ENV{UDEV_CONFIG_FILE} = $conf_tmp;
+       $ENV{UDEV_RULES_FILE} = $conf_tmp;
 
        # create temporary config
        open CONF, ">$conf_tmp" || die "unable to create config file: $conf_tmp";