|
 |
6136c1 |
From 7821ecc0b35c422bc8ed26e0e44c841d067f88d7 Mon Sep 17 00:00:00 2001
|
|
|
6136c1 |
From: Martin Wilck <mwilck@suse.com>
|
|
|
6136c1 |
Date: Tue, 24 Apr 2018 18:27:25 +0200
|
|
|
6136c1 |
Subject: [PATCH] test/udev-test.pl: merge "space and var with space" tests
|
|
|
6136c1 |
|
|
|
6136c1 |
As we can check multiple links in a single test now, these 3
|
|
|
6136c1 |
tests can be merged into one.
|
|
|
6136c1 |
|
|
|
6136c1 |
(cherry picked from commit 2084fe0d3290c525ecb9faa07d07c3abc2488e59)
|
|
|
6136c1 |
|
|
|
6136c1 |
Related: #1642728
|
|
|
6136c1 |
---
|
|
|
6136c1 |
test/udev-test.pl | 31 +++----------------------------
|
|
|
6136c1 |
1 file changed, 3 insertions(+), 28 deletions(-)
|
|
|
6136c1 |
|
|
|
6136c1 |
diff --git a/test/udev-test.pl b/test/udev-test.pl
|
|
|
6136c1 |
index 6928439d14..880a73b10b 100755
|
|
|
6136c1 |
--- a/test/udev-test.pl
|
|
|
6136c1 |
+++ b/test/udev-test.pl
|
|
|
6136c1 |
@@ -1103,34 +1103,9 @@ EOF
|
|
|
6136c1 |
devices => [
|
|
|
6136c1 |
{
|
|
|
6136c1 |
devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
|
|
|
6136c1 |
- exp_links => ["first"],
|
|
|
6136c1 |
- not_exp_links => [" "],
|
|
|
6136c1 |
- }],
|
|
|
6136c1 |
- rules => <
|
|
|
6136c1 |
-ENV{WITH_WS}=" one two three "
|
|
|
6136c1 |
-SYMLINK=" first name-\$env{WITH_WS}-end another_symlink a b c "
|
|
|
6136c1 |
-EOF
|
|
|
6136c1 |
- },
|
|
|
6136c1 |
- {
|
|
|
6136c1 |
- desc => "symlink with space and var with space, part 2",
|
|
|
6136c1 |
- devices => [
|
|
|
6136c1 |
- {
|
|
|
6136c1 |
- devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
|
|
|
6136c1 |
- exp_links => ["name-one_two_three-end"],
|
|
|
6136c1 |
- not_exp_links => [" "],
|
|
|
6136c1 |
- }],
|
|
|
6136c1 |
- rules => <
|
|
|
6136c1 |
-ENV{WITH_WS}=" one two three "
|
|
|
6136c1 |
-SYMLINK=" first name-\$env{WITH_WS}-end another_symlink a b c "
|
|
|
6136c1 |
-EOF
|
|
|
6136c1 |
- },
|
|
|
6136c1 |
- {
|
|
|
6136c1 |
- desc => "symlink with space and var with space, part 3",
|
|
|
6136c1 |
- devices => [
|
|
|
6136c1 |
- {
|
|
|
6136c1 |
- devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
|
|
|
6136c1 |
- exp_links => ["another_symlink"],
|
|
|
6136c1 |
- not_exp_links => [" "],
|
|
|
6136c1 |
+ exp_links => ["first", "name-one_two_three-end",
|
|
|
6136c1 |
+ "another_symlink", "a", "b", "c"],
|
|
|
6136c1 |
+ not_exp_links => [" "],
|
|
|
6136c1 |
}],
|
|
|
6136c1 |
rules => <
|
|
|
6136c1 |
ENV{WITH_WS}=" one two three "
|