summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgreg@kroah.com <greg@kroah.com>2003-12-03 01:09:05 -0800
committerGreg KH <gregkh@suse.de>2005-04-26 21:13:05 -0700
commitfd9594b61fb5ac4106731c087af614940b066df4 (patch)
tree56985f7a51e2ee44d8c02575f05f1b92f9e53a04
parente8bacccab296d6b75c4c9f43cb4e71007aff5b8a (diff)
[PATCH] fix up the tests to support the rules file name change
-rw-r--r--test/label_test1
-rw-r--r--test/modifier_test1
-rw-r--r--test/replace_test1
-rw-r--r--test/topo_test1
-rw-r--r--test/udev-test.pl2
5 files changed, 5 insertions, 1 deletions
diff --git a/test/label_test b/test/label_test
index 0bf89226cb..b0a605cdac 100644
--- 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 3dcd4454fc..a028d20e4d 100644
--- 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 c8e54f8f8d..aae07b48ac 100644
--- 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 2a19c8b5f8..71121f478e 100644
--- 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 8b967c353c..8af09a027b 100644
--- 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";