daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
592caf
From b05c8d2e10c773b9bcae17055be48a2291ca6fa6 Mon Sep 17 00:00:00 2001
592caf
From: Michal Sekletar <msekleta@redhat.com>
592caf
Date: Tue, 2 Mar 2021 12:57:59 -0500
592caf
Subject: [PATCH] Revert "test: add test cases for empty string match" and
592caf
 "test: add test case for multi matches when use ||"
592caf
592caf
This effectively reverts commits 03bc565e6e3249385c4e1ca0ae27670ca2ad9a41
592caf
and 03b766cc937ffa4dcb7cfb25b2ac20d8a00cb6db.
592caf
592caf
Resolves: #1931947
592caf
---
592caf
 test/udev-test.pl | 98 -----------------------------------------------
592caf
 1 file changed, 98 deletions(-)
592caf
592caf
diff --git a/test/udev-test.pl b/test/udev-test.pl
592caf
index 5b1e33504e..0612859cda 100755
592caf
--- a/test/udev-test.pl
592caf
+++ b/test/udev-test.pl
592caf
@@ -1732,104 +1732,6 @@ KERNEL=="dontknow|ttyACM0a|nothing|attyACM0", SYMLINK+="wrong1"
592caf
 KERNEL=="X|attyACM0|dontknow|ttyACM0a|nothing|attyACM0", SYMLINK+="wrong2"
592caf
 KERNEL=="all|dontknow|ttyACM0", SYMLINK+="right"
592caf
 KERNEL=="ttyACM0a|nothing", SYMLINK+="wrong3"
592caf
-EOF
592caf
-        },
592caf
-        {
592caf
-               desc            => "test multi matches 5",
592caf
-               devices => [
592caf
-                       {
592caf
-                               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
592caf
-                               exp_links       => ["found"],
592caf
-                               not_exp_name    => "bad",
592caf
-                       }],
592caf
-                rules           => <
592caf
-KERNEL=="sda", TAG="foo"
592caf
-TAGS=="|foo", SYMLINK+="found"
592caf
-TAGS=="|aaa", SYMLINK+="bad"
592caf
-EOF
592caf
-        },
592caf
-        {
592caf
-                desc            => "test multi matches 6",
592caf
-                devices => [
592caf
-                        {
592caf
-                                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
592caf
-                                exp_links       => ["found"],
592caf
-                                not_exp_name    => "bad",
592caf
-                       }],
592caf
-                rules           => <
592caf
-KERNEL=="sda", TAG=""
592caf
-TAGS=="|foo", SYMLINK+="found"
592caf
-TAGS=="aaa|bbb", SYMLINK+="bad"
592caf
-EOF
592caf
-        },
592caf
-        {
592caf
-                desc            => "test multi matches 7",
592caf
-                devices => [
592caf
-                        {
592caf
-                                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
592caf
-                                exp_links       => ["found"],
592caf
-                                not_exp_name    => "bad",
592caf
-                        }],
592caf
-                rules           => <
592caf
-KERNEL=="sda", TAG="foo"
592caf
-TAGS=="foo||bar", SYMLINK+="found"
592caf
-TAGS=="aaa||bbb", SYMLINK+="bad"
592caf
-EOF
592caf
-        },
592caf
-        {
592caf
-                desc            => "test multi matches 8",
592caf
-                devices => [
592caf
-                        {
592caf
-                                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
592caf
-                                exp_links       => ["found"],
592caf
-                                not_exp_name    => "bad",
592caf
-                        }],
592caf
-                rules           => <
592caf
-KERNEL=="sda", TAG=""
592caf
-TAGS=="foo||bar", SYMLINK+="found"
592caf
-TAGS=="aaa|bbb", SYMLINK+="bad"
592caf
-EOF
592caf
-        },
592caf
-        {
592caf
-                desc            => "test multi matches 9",
592caf
-                devices => [
592caf
-                        {
592caf
-                                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
592caf
-                                exp_links       => ["found"],
592caf
-                                not_exp_name    => "bad",
592caf
-                        }],
592caf
-                rules           => <
592caf
-KERNEL=="sda", TAG="foo"
592caf
-TAGS=="foo|", SYMLINK+="found"
592caf
-TAGS=="aaa|", SYMLINK+="bad"
592caf
-EOF
592caf
-        },
592caf
-        {
592caf
-                desc            => "test multi matches 10",
592caf
-                devices => [
592caf
-                        {
592caf
-                                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
592caf
-                                exp_links       => ["found"],
592caf
-                                not_exp_name    => "bad",
592caf
-                        }],
592caf
-                rules           => <
592caf
-KERNEL=="sda", TAG=""
592caf
-TAGS=="foo|", SYMLINK+="found"
592caf
-TAGS=="aaa|bbb", SYMLINK+="bad"
592caf
-EOF
592caf
-        },
592caf
-        {
592caf
-                desc            => "test multi matches 11",
592caf
-                devices => [
592caf
-                        {
592caf
-                                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
592caf
-                                exp_links       => ["found"],
592caf
-                                not_exp_name    => "bad",
592caf
-                        }],
592caf
-                rules           => <
592caf
-KERNEL=="sda", TAG="c"
592caf
-TAGS=="foo||bar||c", SYMLINK+="found"
592caf
-TAGS=="aaa||bbb||ccc", SYMLINK+="bad"
592caf
 EOF
592caf
         },
592caf
         {