diff --git a/test/echoargs.c b/test/echoargs.c index 38ce5fa0fb..f61df450a1 100644 --- a/test/echoargs.c +++ b/test/echoargs.c @@ -37,8 +37,7 @@ int main(int argc, const char * const *argv, const char* const* env) apr_file_open_stdout(&file, pool); for (i = 1; i < argc; i++) { - if (i > 1) apr_file_puts(",", file); - apr_file_puts(argv[i], file); + apr_file_printf(file, "%d: [%s]\n", i, argv[i]); } apr_terminate(); diff --git a/test/testproc.c b/test/testproc.c index 50ea8e751a..80f7195468 100644 --- a/test/testproc.c +++ b/test/testproc.c @@ -217,14 +217,16 @@ static void test_proc_args(abts_case* tc, void* data) actual = apr_pstrcat(p, actual, buf, NULL); } - expected = "1" "," - "" "," - "\"te st" "," - " a\\b" "," - " a\\\\b" "," - " \\" "," - "new\nline" "," - " \\\\"; + expected = + "1: [1]" "\n" + "2: []" "\n" + "3: [\"te st]" "\n" + "4: [ a\\b]" "\n" + "5: [ a\\\\b]" "\n" + "6: [ \\]" "\n" + "7: [new\nline]" "\n" + "8: [ \\\\]" "\n"; + ABTS_STR_EQUAL(tc, expected, actual); }