virshtest: Adapt 'echo --split' tests to DO_TEST_SCRIPT

Optimize invocation of the tests to share one 'virsh' binary as they
don't influence each other.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/tests/virshtest.c b/tests/virshtest.c
index 376fb861ed8572e2a63100bde37c8ce3a4cc144e..51314859b91f217cc06d90a0fd9c1c385d8b6650 100644 (file)
--- a/tests/virshtest.c
+++ b/tests/virshtest.c
@@ -682,16 +682,7 @@ mymain(void)
     DO_TEST(47, "a\n", "\\# ignored;echo a\n'#also' ignored");
 
     /* test of splitting in vshStringToArray */
-    DO_TEST(48, "a\nb,c,\nd,,e,,\nf,,,e\n",
-            "-q", "echo", "--split", "a,b,,c,,,d,,,,e,,,,,f,,,,,,e");
-    DO_TEST(49, "\na\nb,c,\nd,,e,,\nf,,,e\n\n",
-            "-q", "echo", "--split", ",a,b,,c,,,d,,,,e,,,,,f,,,,,,e,");
-    DO_TEST(50, ",a\nb,c,\nd,,e,,\nf,,,e,\n",
-            "-q", "echo", "--split", ",,a,b,,c,,,d,,,,e,,,,,f,,,,,,e,,");
-    DO_TEST(51, ",\na\nb,c,\nd,,e,,\nf,,,e,\n\n",
-            "-q", "echo", "--split", ",,,a,b,,c,,,d,,,,e,,,,,f,,,,,,e,,,");
-    DO_TEST(52, ",,a\nb,c,\nd,,e,,\nf,,,e,,\n",
-            "-q", "echo", "--split", ",,,,a,b,,c,,,d,,,,e,,,,,f,,,,,,e,,,,");
+    DO_TEST_SCRIPT("echo-split", NULL, VIRSH_DEFAULT, "-q");
 # undef DO_TEST
 
     VIR_FREE(custom_uri);

diff --git a/tests/virshtestdata/echo-split.in b/tests/virshtestdata/echo-split.in
new file mode 100644 (file)
index 0000000..2df9f4d
--- /dev/null
+++ b/tests/virshtestdata/echo-split.in
@@ -0,0 +1,5 @@
+echo --split a,b,,c,,,d,,,,e,,,,,f,,,,,,e
+echo --split ,a,b,,c,,,d,,,,e,,,,,f,,,,,,e,
+echo --split ,,a,b,,c,,,d,,,,e,,,,,f,,,,,,e,,
+echo --split ,,,a,b,,c,,,d,,,,e,,,,,f,,,,,,e,,,
+echo --split ,,,,a,b,,c,,,d,,,,e,,,,,f,,,,,,e,,,,

diff --git a/tests/virshtestdata/echo-split.out b/tests/virshtestdata/echo-split.out
new file mode 100644 (file)
index 0000000..88bf09c
--- /dev/null
+++ b/tests/virshtestdata/echo-split.out
@@ -0,0 +1,24 @@
+a
+b,c,
+d,,e,,
+f,,,e
+
+a
+b,c,
+d,,e,,
+f,,,e
+
+,a
+b,c,
+d,,e,,
+f,,,e,
+,
+a
+b,c,
+d,,e,,
+f,,,e,
+
+,,a
+b,c,
+d,,e,,
+f,,,e,,