55 lines
2.8 KiB
Diff
55 lines
2.8 KiB
Diff
From e96d192a498d4470a512f8243ad60e3525218662 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
Date: Thu, 18 Dec 2014 17:01:42 -0500
|
|
Subject: [PATCH] test-strv: use STRV_MAKE
|
|
|
|
(cherry picked from commit 30bcc05295944cfc2f3ed9159592130c003e19f5)
|
|
---
|
|
src/test/test-strv.c | 26 +++++++++++++-------------
|
|
1 file changed, 13 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/src/test/test-strv.c b/src/test/test-strv.c
|
|
index bbfe306d7d..204a821d6e 100644
|
|
--- a/src/test/test-strv.c
|
|
+++ b/src/test/test-strv.c
|
|
@@ -159,7 +159,7 @@ static void test_strv_quote_unquote(const char* const *split, const char *quoted
|
|
}
|
|
}
|
|
|
|
-static void test_strv_unquote(const char *quoted, const char **list) {
|
|
+static void test_strv_unquote(const char *quoted, char **list) {
|
|
_cleanup_strv_free_ char **s;
|
|
_cleanup_free_ char *j;
|
|
unsigned i = 0;
|
|
@@ -431,18 +431,18 @@ int main(int argc, char *argv[]) {
|
|
test_strv_quote_unquote(input_table_quotes, QUOTES_STRING);
|
|
test_strv_quote_unquote(input_table_spaces, SPACES_STRING);
|
|
|
|
- test_strv_unquote(" foo=bar \"waldo\" zzz ", (const char*[]) { "foo=bar", "waldo", "zzz", NULL });
|
|
- test_strv_unquote("", (const char*[]) { NULL });
|
|
- test_strv_unquote(" ", (const char*[]) { NULL });
|
|
- test_strv_unquote(" ", (const char*[]) { NULL });
|
|
- test_strv_unquote(" x", (const char*[]) { "x", NULL });
|
|
- test_strv_unquote("x ", (const char*[]) { "x", NULL });
|
|
- test_strv_unquote(" x ", (const char*[]) { "x", NULL });
|
|
- test_strv_unquote(" \"x\" ", (const char*[]) { "x", NULL });
|
|
- test_strv_unquote(" 'x' ", (const char*[]) { "x", NULL });
|
|
- test_strv_unquote(" 'x\"' ", (const char*[]) { "x\"", NULL });
|
|
- test_strv_unquote(" \"x'\" ", (const char*[]) { "x'", NULL });
|
|
- test_strv_unquote("a '--b=c \"d e\"'", (const char*[]) { "a", "--b=c \"d e\"", NULL });
|
|
+ test_strv_unquote(" foo=bar \"waldo\" zzz ", STRV_MAKE("foo=bar", "waldo", "zzz"));
|
|
+ test_strv_unquote("", STRV_MAKE_EMPTY);
|
|
+ test_strv_unquote(" ", STRV_MAKE_EMPTY);
|
|
+ test_strv_unquote(" ", STRV_MAKE_EMPTY);
|
|
+ test_strv_unquote(" x", STRV_MAKE("x"));
|
|
+ test_strv_unquote("x ", STRV_MAKE("x"));
|
|
+ test_strv_unquote(" x ", STRV_MAKE("x"));
|
|
+ test_strv_unquote(" \"x\" ", STRV_MAKE("x"));
|
|
+ test_strv_unquote(" 'x' ", STRV_MAKE("x"));
|
|
+ test_strv_unquote(" 'x\"' ", STRV_MAKE("x\""));
|
|
+ test_strv_unquote(" \"x'\" ", STRV_MAKE("x'"));
|
|
+ test_strv_unquote("a '--b=c \"d e\"'", STRV_MAKE("a", "--b=c \"d e\""));
|
|
|
|
test_invalid_unquote("a --b='c \"d e\"'");
|
|
test_invalid_unquote("a --b='c \"d e\" '");
|