picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[PATCH] udev-test.pl cleanup

Browse source 
Here is a small name change, so all expected values are named exp_*
This commit is contained in:
kay.sievers@vrfy.org 2004-03-12 18:18:58 -08:00 committed by Greg KH
parent 7d12d4e175
commit c013b034ae
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
test/udev-test.pl
View file

@ -36,7 +36,7 @@ my @tests = (
desc => "label test of scsi disc", desc => "label test of scsi disc",
subsys => "block", subsys => "block",
devpath => "block/sda", devpath => "block/sda",
exp_name=> "boot_disk" , exp_name => "boot_disk" ,
conf => <<EOF conf => <<EOF
BUS="scsi", SYSFS{vendor}="IBM-ESXS", NAME="boot_disk%n" BUS="scsi", SYSFS{vendor}="IBM-ESXS", NAME="boot_disk%n"
KERNEL="ttyUSB0", NAME="visor" KERNEL="ttyUSB0", NAME="visor"
@ -46,7 +46,7 @@ EOF
desc => "label test of scsi partition", desc => "label test of scsi partition",
subsys => "block", subsys => "block",
devpath => "block/sda/sda1", devpath => "block/sda/sda1",
exp_name=> "boot_disk1" , exp_name => "boot_disk1" ,
conf => <<EOF conf => <<EOF
BUS="scsi", SYSFS{vendor}="IBM-ESXS", NAME="boot_disk%n" BUS="scsi", SYSFS{vendor}="IBM-ESXS", NAME="boot_disk%n"
EOF EOF
@ -55,7 +55,7 @@ EOF
desc => "label test of pattern match", desc => "label test of pattern match",
subsys => "block", subsys => "block",
devpath => "block/sda/sda1", devpath => "block/sda/sda1",
exp_name=> "boot_disk1" , exp_name => "boot_disk1" ,
conf => <<EOF conf => <<EOF
BUS="scsi", SYSFS{vendor}="?IBM-ESXS", NAME="boot_disk%n-1" BUS="scsi", SYSFS{vendor}="?IBM-ESXS", NAME="boot_disk%n-1"
BUS="scsi", SYSFS{vendor}="IBM-ESXS?", NAME="boot_disk%n-2" BUS="scsi", SYSFS{vendor}="IBM-ESXS?", NAME="boot_disk%n-2"
@ -529,7 +529,7 @@ EOF
subsys => "block", subsys => "block",
devpath => "block/sda", devpath => "block/sda",
exp_name => "node", exp_name => "node",
perms => "5000::0444", exp_perms => "5000::0444",
conf => <<EOF conf => <<EOF
BUS="scsi", KERNEL="sda", NAME="node", OWNER="5000", MODE="0444" BUS="scsi", KERNEL="sda", NAME="node", OWNER="5000", MODE="0444"
EOF EOF
@ -610,9 +610,9 @@ sub run_test {
my ($dev, $ino, $mode, $nlink, $uid, $gid, $rdev, $size, my ($dev, $ino, $mode, $nlink, $uid, $gid, $rdev, $size,
$atime, $mtime, $ctime, $blksize, $blocks) = stat("$PWD/$udev_root$config->{exp_name}"); $atime, $mtime, $ctime, $blksize, $blocks) = stat("$PWD/$udev_root$config->{exp_name}");
if (defined($config->{perms})) { if (defined($config->{exp_perms})) {
my $wrong = 0; my $wrong = 0;
$config->{perms} =~ m/^(.*):(.*):(.*)$/; $config->{exp_perms} =~ m/^(.*):(.*):(.*)$/;
if ($1 ne "") { if ($1 ne "") {
if ($uid != $1) { $wrong = 1; }; if ($uid != $1) { $wrong = 1; };
} }