From fd9594b61fb5ac4106731c087af614940b066df4 Mon Sep 17 00:00:00 2001 From: "greg@kroah.com" Date: Wed, 3 Dec 2003 01:09:05 -0800 Subject: [PATCH] [PATCH] fix up the tests to support the rules file name change --- test/label_test | 1 + test/modifier_test | 1 + test/replace_test | 1 + test/topo_test | 1 + test/udev-test.pl | 2 +- 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/test/label_test b/test/label_test index 0bf89226..b0a605cd 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 3dcd4454..a028d20e 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 c8e54f8f..aae07b48 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 2a19c8b5..71121f47 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 8b967c35..8af09a02 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"; -- 2.39.5