summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2008-10-14 19:55:57 +0200
committerKay Sievers <kay.sievers@vrfy.org>2008-10-14 19:55:57 +0200
commita1af6b040169352b5cb2e1fe0d2a518783a5ec6d (patch)
tree03130b51d5a755a1877739ebec97bac94af8cebe /test
parentfb780a48e656e3d107e5193d3781a613eb1d068e (diff)
test: move global ENV{ENV_KEY_TEST}="test" to local rule
Diffstat (limited to 'test')
-rwxr-xr-xtest/udev-test.pl8
1 files changed, 5 insertions, 3 deletions
diff --git a/test/udev-test.pl b/test/udev-test.pl
index df5e3fcb2a..4c6a70f1af 100755
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -1195,6 +1195,7 @@ EOF
devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1",
exp_name => "true",
rules => <<EOF
+ENV{ENV_KEY_TEST}="test"
SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ENV_KEY_TEST}=="go", NAME="wrong"
SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ENV_KEY_TEST}=="test", NAME="true"
SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ENV_KEY_TEST}=="bad", NAME="bad"
@@ -1206,6 +1207,7 @@ EOF
devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1",
exp_name => "true",
rules => <<EOF
+ENV{ENV_KEY_TEST}="test"
SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ENV_KEY_TEST}=="go", NAME="wrong"
SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ENV_KEY_TEST}=="yes", ENV{ACTION}=="add", ENV{DEVPATH}=="/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sdax1", NAME="no"
SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ENV_KEY_TEST}=="test", ENV{ACTION}=="add", ENV{DEVPATH}=="/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", NAME="true"
@@ -1620,7 +1622,6 @@ EOF
);
# set env
-$ENV{ENV_KEY_TEST} = "test";
$ENV{SYSFS_PATH} = $sysfs;
$ENV{UDEV_CONFIG_FILE} = $udev_conf;
@@ -1635,10 +1636,11 @@ sub udev {
close CONF;
$ENV{ACTION} = $action;
+ $ENV{SUBSYSTEM} = $subsys;
if ($valgrind > 0) {
- system("$udev_bin_valgrind $subsys");
+ system("$udev_bin_valgrind");
} else {
- system("$udev_bin $subsys");
+ system("$udev_bin");
}
}