diff options
| author | kay.sievers@vrfy.org <kay.sievers@vrfy.org> | 2003-12-16 23:36:19 -0800 |
|---|---|---|
| committer | Greg KH <gregkh@suse.de> | 2005-04-26 21:13:08 -0700 |
| commit | d94df232423870641132b307d74281f692219730 (patch) | |
| tree | 8706b9c988b67daee930052e0855ca613735c104 /test | |
| parent | 600ee7f73e5381764803725e68a0f953bd2f46fd (diff) | |
[PATCH] don't rely on field order in namedev_parse
o change the parsing to get a key from the rule and sort it
into our list of known keys instead of expecting a special order
o the key to match a sysfs file must be prependend by 'SYSFS_' now
to match with the new parsing.
(The config must be changed, but it's a bit more descriptive too.)
o put names of fields in define's, like the name of the methods
o update all tests and the man page
Diffstat (limited to 'test')
| -rw-r--r-- | test/label_test | 2 | ||||
| -rw-r--r-- | test/udev-test.pl | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/test/label_test b/test/label_test index fb3fa2359f..09ccab366e 100644 --- a/test/label_test +++ b/test/label_test @@ -8,7 +8,7 @@ export SYSFS_PATH=$PWD/sys/ export UDEV_CONFIG_FILE=$PWD/$CONFIG cat > $RULES << EOF -LABEL, BUS="scsi", vendor="IBM-ESXS", NAME="boot_disk%n" +LABEL, BUS="scsi", SYSFS_vendor="IBM-ESXS", NAME="boot_disk%n" EOF cat > $CONFIG << EOF diff --git a/test/udev-test.pl b/test/udev-test.pl index 1a35e3da82..08b99f041f 100644 --- a/test/udev-test.pl +++ b/test/udev-test.pl @@ -38,7 +38,7 @@ my @tests = ( devpath => "block/sda", expected => "boot_disk" , conf => <<EOF -LABEL, BUS="scsi", vendor="IBM-ESXS", NAME="boot_disk%n" +LABEL, BUS="scsi", SYSFS_vendor="IBM-ESXS", NAME="boot_disk%n" REPLACE, KERNEL="ttyUSB0", NAME="visor" EOF }, @@ -48,7 +48,7 @@ EOF devpath => "block/sda/sda1", expected => "boot_disk1" , conf => <<EOF -LABEL, BUS="scsi", vendor="IBM-ESXS", NAME="boot_disk%n" +LABEL, BUS="scsi", SYSFS_vendor="IBM-ESXS", NAME="boot_disk%n" EOF }, { @@ -57,10 +57,10 @@ EOF devpath => "block/sda/sda1", expected => "boot_disk1" , conf => <<EOF -LABEL, BUS="scsi", vendor="?IBM-ESXS", NAME="boot_disk%n-1" -LABEL, BUS="scsi", vendor="IBM-ESXS?", NAME="boot_disk%n-2" -LABEL, BUS="scsi", vendor="IBM-ES??", NAME="boot_disk%n" -LABEL, BUS="scsi", vendor="IBM-ESXSS", NAME="boot_disk%n-3" +LABEL, BUS="scsi", SYSFS_vendor="?IBM-ESXS", NAME="boot_disk%n-1" +LABEL, BUS="scsi", SYSFS_vendor="IBM-ESXS?", NAME="boot_disk%n-2" +LABEL, BUS="scsi", SYSFS_vendor="IBM-ES??", NAME="boot_disk%n" +LABEL, BUS="scsi", SYSFS_vendor="IBM-ESXSS", NAME="boot_disk%n-3" EOF }, { @@ -167,7 +167,7 @@ EOF devpath => "block/sda", expected => "lun0/disc" , conf => <<EOF -LABEL, BUS="scsi", vendor="IBM-ESXS", NAME="lun0/%D" +LABEL, BUS="scsi", SYSFS_vendor="IBM-ESXS", NAME="lun0/%D" EOF }, { @@ -176,7 +176,7 @@ EOF devpath => "block/sda/sda2", expected => "lun0/part2" , conf => <<EOF -LABEL, BUS="scsi", vendor="IBM-ESXS", NAME="lun0/%D" +LABEL, BUS="scsi", SYSFS_vendor="IBM-ESXS", NAME="lun0/%D" EOF }, { @@ -205,7 +205,7 @@ EOF devpath => "block/sda/sda2", expected => "1/2/a/b/symlink" , conf => <<EOF -LABEL, BUS="scsi", vendor="IBM-ESXS", NAME="1/2/node", SYMLINK="1/2/a/b/symlink" +LABEL, BUS="scsi", SYSFS_vendor="IBM-ESXS", NAME="1/2/node", SYMLINK="1/2/a/b/symlink" EOF }, { @@ -214,7 +214,7 @@ EOF devpath => "block/sda/sda2", expected => "1/2/symlink" , conf => <<EOF -LABEL, BUS="scsi", vendor="IBM-ESXS", NAME="1/2/a/b/node", SYMLINK="1/2/symlink" +LABEL, BUS="scsi", SYSFS_vendor="IBM-ESXS", NAME="1/2/a/b/node", SYMLINK="1/2/symlink" EOF }, { @@ -223,7 +223,7 @@ EOF devpath => "block/sda/sda2", expected => "1/2/c/d/symlink" , conf => <<EOF -LABEL, BUS="scsi", vendor="IBM-ESXS", NAME="1/2/a/b/node", SYMLINK="1/2/c/d/symlink" +LABEL, BUS="scsi", SYSFS_vendor="IBM-ESXS", NAME="1/2/a/b/node", SYMLINK="1/2/c/d/symlink" EOF }, { |