mirror/stedolan-jq
1
0
Fork 0
mirror of https://github.com/stedolan/jq.git synced 2024-05-11 05:55:39 +00:00
Code Issues Releases Activity

Make --run-tests more informative

Browse Source 
Print the line number and program text on the same output line where a
failure is reported, for all failures that were already reported on
lines starting with '***'.  This makes poring over test logs with
failures much easier.
This commit is contained in:
Nicolas Williams
2014-12-30 10:44:36 -06:00
parent b67bad82cb
commit 90c705f138
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
jq_test.c
View File

@@ -31,6 +31,7 @@ static int skipline(const char* buf) {
} }
static void run_jq_tests(FILE *testdata) { static void run_jq_tests(FILE *testdata) {
char prog[4096];
char buf[4096]; char buf[4096];
int tests = 0, passed = 0, invalid = 0; int tests = 0, passed = 0, invalid = 0;
unsigned int lineno = 0; unsigned int lineno = 0;
@@ -40,14 +41,14 @@ static void run_jq_tests(FILE *testdata) {
assert(jq); assert(jq);
while (1) { while (1) {
if (!fgets(buf, sizeof(buf), testdata)) break; if (!fgets(prog, sizeof(prog), testdata)) break;
lineno++; lineno++;
if (skipline(buf)) continue; if (skipline(prog)) continue;
if (buf[strlen(buf)-1] == '\n') buf[strlen(buf)-1] = 0; if (prog[strlen(prog)-1] == '\n') prog[strlen(prog)-1] = 0;
printf("Testing '%s' at line number %u\n", buf, lineno); printf("Testing '%s' at line number %u\n", prog, lineno);
int pass = 1; int pass = 1;
tests++; tests++;
int compiled = jq_compile(jq, buf); int compiled = jq_compile(jq, prog);
if (!compiled) {invalid++; continue;} if (!compiled) {invalid++; continue;}
printf("Disassembly:\n"); printf("Disassembly:\n");
jq_dump_disassembly(jq, 2); jq_dump_disassembly(jq, 2);
@@ -65,7 +66,7 @@ static void run_jq_tests(FILE *testdata) {
jv actual = jq_next(jq); jv actual = jq_next(jq);
if (!jv_is_valid(actual)) { if (!jv_is_valid(actual)) {
jv_free(actual); jv_free(actual);
printf("*** Insufficient results for test at line number %u\n", lineno); printf("*** Insufficient results for test at line number %u: %s\n", lineno, prog);
pass = 0; pass = 0;
break; break;
} else if (!jv_equal(jv_copy(expected), jv_copy(actual))) { } else if (!jv_equal(jv_copy(expected), jv_copy(actual))) {
@@ -73,7 +74,7 @@ static void run_jq_tests(FILE *testdata) {
jv_dump(jv_copy(expected), 0); jv_dump(jv_copy(expected), 0);
printf(", but got "); printf(", but got ");
jv_dump(jv_copy(actual), 0); jv_dump(jv_copy(actual), 0);
printf(" for test at line number %u\n", lineno); printf(" for test at line number %u: %s\n", lineno, prog);
pass = 0; pass = 0;
} }
jv as_string = jv_dump_string(jv_copy(expected), rand() & ~(JV_PRINT_COLOUR|JV_PRINT_REFCOUNT)); jv as_string = jv_dump_string(jv_copy(expected), rand() & ~(JV_PRINT_COLOUR|JV_PRINT_REFCOUNT));
@@ -89,7 +90,7 @@ static void run_jq_tests(FILE *testdata) {
if (jv_is_valid(extra)) { if (jv_is_valid(extra)) {
printf("*** Superfluous result: "); printf("*** Superfluous result: ");
jv_dump(extra, 0); jv_dump(extra, 0);
printf(" for test at line number %u\n", lineno); printf(" for test at line number %u, %s\n", lineno, prog);
pass = 0; pass = 0;
} else { } else {
jv_free(extra); jv_free(extra);