External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 05:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

virshtest: Drop string form of expected output data of "echo" tests

Browse Source 
Now that the output is tested against files these are not needed any
more. The brief existence of both proved that the output is identical.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2024-03-12 14:34:03 +01:00
parent d15b79a35c
commit e8e79e38e5
1 changed files with 36 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
tests/virshtest.c
View File

@ -440,7 +440,6 @@ struct testInfo {
const char *testname; /* used to generate output filename */ const char *testname; /* used to generate output filename */
const char *filter; const char *filter;
const char *const *argv; const char *const *argv;
const char *result;
}; };
static int testCompare(const void *data) static int testCompare(const void *data)
@ -453,7 +452,7 @@ static int testCompare(const void *data)
abs_srcdir, info->testname); abs_srcdir, info->testname);
} }
return testCompareOutputLit(outfile, info->result, info->filter, info->argv); return testCompareOutputLit(outfile, NULL, info->filter, info->argv);
} }
@ -568,7 +567,7 @@ mymain(void)
abs_srcdir, testname); \ abs_srcdir, testname); \
const char *myargv[] = { __VA_ARGS__, NULL, NULL }; \ const char *myargv[] = { __VA_ARGS__, NULL, NULL }; \
const char **tmp = myargv; \ const char **tmp = myargv; \
const struct testInfo info = { testname, testfilter, myargv, NULL }; \ const struct testInfo info = { testname, testfilter, myargv }; \
g_autofree char *scriptarg = NULL; \ g_autofree char *scriptarg = NULL; \
if (virFileReadAll(infile, 256 * 1024, &scriptarg) < 0) { \ if (virFileReadAll(infile, 256 * 1024, &scriptarg) < 0) { \
fprintf(stderr, "\nfailed to load '%s'\n", infile); \ fprintf(stderr, "\nfailed to load '%s'\n", infile); \
@ -581,66 +580,66 @@ mymain(void)
ret = -1; \ ret = -1; \
} while (0); } while (0);
# define DO_TEST_FULL(testname_, filter, result, ...) \ # define DO_TEST_FULL(testname_, filter, ...) \
do { \ do { \
const char *testname = testname_; \ const char *testname = testname_; \
const char *myargv[] = { __VA_ARGS__, NULL }; \ const char *myargv[] = { __VA_ARGS__, NULL }; \
const struct testInfo info = { testname, NULL, myargv, result }; \ const struct testInfo info = { testname, NULL, myargv }; \
if (virTestRun(testname, testCompare, &info) < 0) \ if (virTestRun(testname, testCompare, &info) < 0) \
ret = -1; \ ret = -1; \
} while (0) } while (0)
/* automatically numbered test invocation */ /* automatically numbered test invocation */
# define DO_TEST(result, ...) \ # define DO_TEST(...) \
DO_TEST_FULL(virTestCounterNext(), NULL, result, VIRSH_DEFAULT, __VA_ARGS__); DO_TEST_FULL(virTestCounterNext(), NULL, VIRSH_DEFAULT, __VA_ARGS__);
/* Arg parsing quote removal tests. */ /* Arg parsing quote removal tests. */
virTestCounterReset("echo-quote-removal-"); virTestCounterReset("echo-quote-removal-");
DO_TEST("a b\n", "echo a \t b"); DO_TEST("echo a \t b");
DO_TEST("a \t b\n", "echo \"a \t b\""); DO_TEST("echo \"a \t b\"");
DO_TEST("a \t b\n", "echo 'a \t b'"); DO_TEST("echo 'a \t b'");
DO_TEST("a \t b\n", "echo a\\ \\\t\\ b"); DO_TEST("echo a\\ \\\t\\ b");
DO_TEST("' \" \\;echo\ta\n", "echo", "'", "\"", "\\;echo\ta"); DO_TEST("echo", "'", "\"", "\\;echo\ta");
DO_TEST("' \" ;echo a\n", "echo \\' \\\" \\;echo\ta"); DO_TEST("echo \\' \\\" \\;echo\ta");
DO_TEST("' \" \\\na\n", "echo \\' \\\" \\\\;echo\ta"); DO_TEST("echo \\' \\\" \\\\;echo\ta");
DO_TEST("' \" \\\\\n", "echo \"'\" '\"' '\\'\"\\\\\""); DO_TEST("echo \"'\" '\"' '\\'\"\\\\\"");
/* Tests of echo flags. */ /* Tests of echo flags. */
DO_TEST_SCRIPT("echo-escaping", NULL, VIRSH_DEFAULT); DO_TEST_SCRIPT("echo-escaping", NULL, VIRSH_DEFAULT);
virTestCounterReset("echo-escaping-"); virTestCounterReset("echo-escaping-");
DO_TEST("a A 0 + * ; . ' \" / ? = \n < > &\n", "echo", "a", "A", "0", "+", "*", ";", ".", "'", "\"", "/", "?", "=", " ", "\n", "<", ">", "&"); DO_TEST("echo", "a", "A", "0", "+", "*", ";", ".", "'", "\"", "/", "?", "=", " ", "\n", "<", ">", "&");
DO_TEST("a A 0 + '*' ';' . ''\\''' '\"' / '?' = ' ' '\n' '<' '>' '&'\n", "echo", "--shell", "a", "A", "0", "+", "*", ";", ".", "'", "\"", "/", "?", "=", " ", "\n", "<", ">", "&"); DO_TEST("echo", "--shell", "a", "A", "0", "+", "*", ";", ".", "'", "\"", "/", "?", "=", " ", "\n", "<", ">", "&");
DO_TEST("a A 0 + * ; . &apos; &quot; / ? = \n &lt; &gt; &amp;\n", "echo", "--xml", "a", "A", "0", "+", "*", ";", ".", "'", "\"", "/", "?", "=", " ", "\n", "<", ">", "&"); DO_TEST("echo", "--xml", "a", "A", "0", "+", "*", ";", ".", "'", "\"", "/", "?", "=", " ", "\n", "<", ">", "&");
/* Tests of -- handling. */ /* Tests of -- handling. */
virTestCounterReset("dash-dash-argument-"); virTestCounterReset("dash-dash-argument-");
DO_TEST("a\n", "--", "echo", "--shell", "a"); DO_TEST("--", "echo", "--shell", "a");
DO_TEST("a\n", "--", "echo", "a", "--shell"); DO_TEST("--", "echo", "a", "--shell");
DO_TEST("a --shell\n", "--", "echo", "--", "a", "--shell"); DO_TEST("--", "echo", "--", "a", "--shell");
DO_TEST("-- --shell a\n", "echo", "--", "--", "--shell", "a"); DO_TEST("echo", "--", "--", "--shell", "a");
DO_TEST("a\n", "echo --s\\h'e'\"l\"l -- a"); DO_TEST("echo --s\\h'e'\"l\"l -- a");
DO_TEST("--shell a\n", "echo \t '-'\"-\" \t --shell \t a"); DO_TEST("echo \t '-'\"-\" \t --shell \t a");
/* Tests of alias handling. */ /* Tests of alias handling. */
DO_TEST_SCRIPT("echo-alias", NULL, VIRSH_DEFAULT); DO_TEST_SCRIPT("echo-alias", NULL, VIRSH_DEFAULT);
DO_TEST_FULL("echo-alias-argv", NULL, "hello\n", VIRSH_DEFAULT, "echo", "--str", "hello"); DO_TEST_FULL("echo-alias-argv", NULL, VIRSH_DEFAULT, "echo", "--str", "hello");
/* Tests of multiple commands. */ /* Tests of multiple commands. */
virTestCounterReset("multiple-commands-"); virTestCounterReset("multiple-commands-");
DO_TEST("a\nb\n", " echo a; echo b;"); DO_TEST(" echo a; echo b;");
DO_TEST("a\nb\n", "\necho a\n echo b\n"); DO_TEST("\necho a\n echo b\n");
DO_TEST("a\nb\n", "ec\\\nho a\n echo \\\n b;"); DO_TEST("ec\\\nho a\n echo \\\n b;");
DO_TEST("a\n b\n", "\"ec\\\nho\" a\n echo \"\\\n b\";"); DO_TEST("\"ec\\\nho\" a\n echo \"\\\n b\";");
DO_TEST("a\n\\\n b\n", "ec\\\nho a\n echo '\\\n b';"); DO_TEST("ec\\\nho a\n echo '\\\n b';");
DO_TEST("a\n", "echo a # b"); DO_TEST("echo a # b");
DO_TEST("a\nc\n", "echo a #b\necho c"); DO_TEST("echo a #b\necho c");
DO_TEST("a\nc\n", "echo a # b\\\necho c"); DO_TEST("echo a # b\\\necho c");
DO_TEST("a # b\n", "echo a '#' b"); DO_TEST("echo a '#' b");
DO_TEST("a # b\n", "echo a \\# b"); DO_TEST("echo a \\# b");
DO_TEST("a\n", "#unbalanced; 'quotes\"\necho a # b"); DO_TEST("#unbalanced; 'quotes\"\necho a # b");
DO_TEST("a\n", "\\# ignored;echo a\n'#also' ignored"); DO_TEST("\\# ignored;echo a\n'#also' ignored");
/* test of splitting in vshStringToArray */ /* test of splitting in vshStringToArray */
DO_TEST_SCRIPT("echo-split", NULL, VIRSH_DEFAULT, "-q"); DO_TEST_SCRIPT("echo-split", NULL, VIRSH_DEFAULT, "-q");