diff options
author | Owen Ou <o@owenou.com> | 2023-07-01 11:01:50 -0700 |
---|---|---|
committer | Owen Ou <o@owenou.com> | 2023-07-01 11:46:41 -0700 |
commit | 6cce62dfa9f402849a066185414c5cb7ab45cee3 (patch) | |
tree | 435e34fa03256f25caea6acf464cd665be6ac05d | |
parent | 25a0608a646e0674de1347f68b947502608fa86e (diff) |
Select gcc binaries to release
-rw-r--r-- | .github/workflows/ci.yml | 16 | ||||
-rw-r--r-- | src/jq_test.c | 196 |
2 files changed, 80 insertions, 132 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 115cd7a7..1e22e6e9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,7 +38,6 @@ jobs: --with-oniguruma=builtin \ YACC="$(which bison) -y" make - cp jq jq-${{ env.SUFFIX }} - name: Test run: | make check @@ -58,7 +57,7 @@ jobs: if-no-files-found: error retention-days: 7 path: | - jq-${{ env.SUFFIX }} + jq macos: strategy: fail-fast: false @@ -95,7 +94,6 @@ jobs: --with-oniguruma=builtin \ YACC="$(brew --prefix)/opt/bison/bin/bison -y" make - cp jq jq-${{ env.SUFFIX }} - name: Test run: | make check @@ -115,7 +113,7 @@ jobs: if-no-files-found: error retention-days: 7 path: | - jq-${{ env.SUFFIX }} + jq windows: strategy: fail-fast: false @@ -157,7 +155,6 @@ jobs: --enable-all-static \ YACC="$(which bison) -y" make - cp jq.exe jq-${{ env.SUFFIX }}.exe - name: Test shell: msys2 {0} run: | @@ -178,7 +175,7 @@ jobs: if-no-files-found: error retention-days: 7 path: | - jq-${{ env.SUFFIX }}.exe + jq.exe release: runs-on: ubuntu-latest permissions: @@ -199,5 +196,10 @@ jobs: TAG_NAME: ${{ github.ref_name }} GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | + mkdir release + cp artifacts/jq-linux-ubuntu-22.04-gcc/jq release/jq-linux-amd64 + cp artifacts/jq-macos-macos-13-gcc/jq release/jq-macos-amd64 + cp artifacts/jq-windows-windows-2022-gcc/jq.exe release/jq-windows-amd64.exe + gh release create $TAG_NAME --draft --title "jq ${TAG_NAME#v}" --generate-notes - gh release upload $TAG_NAME --clobber artifacts/jq-*/* + gh release upload $TAG_NAME --clobber release/jq-* diff --git a/src/jq_test.c b/src/jq_test.c index f7cebbe7..eed633f4 100644 --- a/src/jq_test.c +++ b/src/jq_test.c @@ -8,31 +8,23 @@ static void jv_test(); static void run_jq_tests(jv, int, FILE *, int, int); -int jq_testsuite(jv libdirs, int verbose, int argc, char *argv[]) -{ + +int jq_testsuite(jv libdirs, int verbose, int argc, char* argv[]) { FILE *testdata = stdin; int skip = -1; int take = -1; jv_test(); - if (argc > 0) - { - for (int i = 0; i < argc; i++) - { - if (!strcmp(argv[i], "--skip")) - { - skip = atoi(argv[i + 1]); + if (argc > 0) { + for(int i = 0; i < argc; i++) { + if (!strcmp(argv[i], "--skip")) { + skip = atoi(argv[i+1]); i++; - } - else if (!strcmp(argv[i], "--take")) - { - take = atoi(argv[i + 1]); + } else if (!strcmp(argv[i], "--take")) { + take = atoi(argv[i+1]); i++; - } - else - { + } else { testdata = fopen(argv[i], "r"); - if (!testdata) - { + if (!testdata) { perror("fopen"); exit(1); } @@ -43,33 +35,26 @@ int jq_testsuite(jv libdirs, int verbose, int argc, char *argv[]) return 0; } -static int skipline(const char *buf) -{ +static int skipline(const char* buf) { int p = 0; - while (buf[p] == ' ' || buf[p] == '\t') - p++; - if (buf[p] == '#' || buf[p] == '\n' || buf[p] == 0) - return 1; + while (buf[p] == ' ' || buf[p] == '\t') p++; + if (buf[p] == '#' || buf[p] == '\n' || buf[p] == 0) return 1; return 0; } -static int checkerrormsg(const char *buf) -{ +static int checkerrormsg(const char* buf) { return strcmp(buf, "%%FAIL\n") == 0; } -static int checkfail(const char *buf) -{ +static int checkfail(const char* buf) { return strcmp(buf, "%%FAIL\n") == 0 || strcmp(buf, "%%FAIL IGNORE MSG\n") == 0; } -struct err_data -{ +struct err_data { char buf[4096]; }; -static void test_err_cb(void *data, jv e) -{ +static void test_err_cb(void *data, jv e) { struct err_data *err_data = data; if (jv_get_kind(e) != JV_KIND_STRING) e = jv_dump_string(e, JV_PRINT_INVALID); @@ -80,8 +65,7 @@ static void test_err_cb(void *data, jv e) jv_free(e); } -static void run_jq_tests(jv lib_dirs, int verbose, FILE *testdata, int skip, int take) -{ +static void run_jq_tests(jv lib_dirs, int verbose, FILE *testdata, int skip, int take) { char prog[4096]; char buf[4096]; struct err_data err_msg; @@ -100,52 +84,40 @@ static void run_jq_tests(jv lib_dirs, int verbose, FILE *testdata, int skip, int lib_dirs = jv_array(); jq_set_attr(jq, jv_string("JQ_LIBRARY_PATH"), lib_dirs); - while (1) - { - if (!fgets(prog, sizeof(prog), testdata)) - break; + while (1) { + if (!fgets(prog, sizeof(prog), testdata)) break; lineno++; - if (skipline(prog)) - continue; - if (checkfail(prog)) - { + if (skipline(prog)) continue; + if (checkfail(prog)) { must_fail = 1; check_msg = checkerrormsg(prog); jq_set_error_cb(jq, test_err_cb, &err_msg); continue; } - if (prog[strlen(prog) - 1] == '\n') - prog[strlen(prog) - 1] = 0; + if (prog[strlen(prog)-1] == '\n') prog[strlen(prog)-1] = 0; - if (skip > 0) - { + if (skip > 0) { skip--; // skip past test data - while (fgets(buf, sizeof(buf), testdata)) - { + while (fgets(buf, sizeof(buf), testdata)) { lineno++; if (buf[0] == '\n' || (buf[0] == '\r' && buf[1] == '\n')) break; } - + must_fail = 0; check_msg = 0; continue; - } - else if (skip == 0) - { + } else if (skip == 0) { printf("Skipped %d tests\n", tests_to_skip); skip = -1; } - if (take > 0) - { + if (take > 0) { take--; - } - else if (take == 0) - { + } else if (take == 0) { printf("Hit the number of tests limit (%d), breaking\n", tests_to_take); take = -1; break; @@ -156,32 +128,22 @@ static void run_jq_tests(jv lib_dirs, int verbose, FILE *testdata, int skip, int printf("Test #%d: '%s' at line number %u\n", tests + tests_to_skip, prog, lineno); int compiled = jq_compile(jq, prog); - if (must_fail) - { + if (must_fail) { jq_set_error_cb(jq, NULL, NULL); - if (!fgets(buf, sizeof(buf), testdata)) - { - invalid++; - break; - } + if (!fgets(buf, sizeof(buf), testdata)) { invalid++; break; } lineno++; - if (buf[strlen(buf) - 1] == '\n') - buf[strlen(buf) - 1] = 0; - if (compiled) - { + if (buf[strlen(buf)-1] == '\n') buf[strlen(buf)-1] = 0; + if (compiled) { printf("*** Test program compiled that should not have at line %u: %s\n", lineno, prog); must_fail = 0; check_msg = 0; invalid++; continue; } - if (check_msg && strcmp(buf, err_msg.buf) != 0) - { + if (check_msg && strcmp(buf, err_msg.buf) != 0) { printf("*** Erroneous test program failed with wrong message (%s) at line %u: %s\n", err_msg.buf, lineno, prog); invalid++; - } - else - { + } else { passed++; } must_fail = 0; @@ -189,62 +151,48 @@ static void run_jq_tests(jv lib_dirs, int verbose, FILE *testdata, int skip, int continue; } - if (!compiled) - { + if (!compiled) { printf("*** Test program failed to compile at line %u: %s\n", lineno, prog); invalid++; // skip past test data - while (fgets(buf, sizeof(buf), testdata)) - { + while (fgets(buf, sizeof(buf), testdata)) { lineno++; if (buf[0] == '\n' || (buf[0] == '\r' && buf[1] == '\n')) break; } continue; } - if (verbose) - { + if (verbose) { printf("Disassembly:\n"); jq_dump_disassembly(jq, 2); printf("\n"); } - if (!fgets(buf, sizeof(buf), testdata)) - { - invalid++; - break; - } + if (!fgets(buf, sizeof(buf), testdata)) { invalid++; break; } lineno++; jv input = jv_parse(buf); - if (!jv_is_valid(input)) - { + if (!jv_is_valid(input)) { printf("*** Input is invalid on line %u: %s\n", lineno, buf); invalid++; continue; } jq_start(jq, input, verbose ? JQ_DEBUG_TRACE : 0); - while (fgets(buf, sizeof(buf), testdata)) - { + while (fgets(buf, sizeof(buf), testdata)) { lineno++; - if (skipline(buf)) - break; + if (skipline(buf)) break; jv expected = jv_parse(buf); - if (!jv_is_valid(expected)) - { + if (!jv_is_valid(expected)) { printf("*** Expected result is invalid on line %u: %s\n", lineno, buf); invalid++; continue; } jv actual = jq_next(jq); - if (!jv_is_valid(actual)) - { + if (!jv_is_valid(actual)) { jv_free(actual); printf("*** Insufficient results for test at line number %u: %s\n", lineno, prog); pass = 0; break; - } - else if (!jv_equal(jv_copy(expected), jv_copy(actual))) - { + } else if (!jv_equal(jv_copy(expected), jv_copy(actual))) { printf("*** Expected "); jv_dump(jv_copy(expected), 0); printf(", but got "); @@ -252,7 +200,7 @@ static void run_jq_tests(jv lib_dirs, int verbose, FILE *testdata, int skip, int printf(" for test at line number %u: %s\n", lineno, prog); pass = 0; } - jv as_string = jv_dump_string(jv_copy(expected), rand() & ~(JV_PRINT_COLOR | JV_PRINT_REFCOUNT)); + jv as_string = jv_dump_string(jv_copy(expected), rand() & ~(JV_PRINT_COLOR|JV_PRINT_REFCOUNT)); jv reparsed = jv_parse_sized(jv_string_value(as_string), jv_string_length_bytes(jv_copy(as_string))); assert(jv_equal(jv_copy(expected), jv_copy(reparsed))); jv_free(as_string); @@ -260,47 +208,40 @@ static void run_jq_tests(jv lib_dirs, int verbose, FILE *testdata, int skip, int jv_free(expected); jv_free(actual); } - if (pass) - { + if (pass) { jv extra = jq_next(jq); - if (jv_is_valid(extra)) - { + if (jv_is_valid(extra)) { printf("*** Superfluous result: "); jv_dump(extra, 0); printf(" for test at line number %u, %s\n", lineno, prog); pass = 0; - } - else - { + } else { jv_free(extra); } } - passed += pass; + passed+=pass; } jq_teardown(&jq); int total_skipped = tests_to_skip; - if (skip > 0) - { + if (skip > 0) { total_skipped = tests_to_skip - skip; } - printf("%d of %d tests passed (%d malformed, %d skipped)\n", - passed, tests, invalid, total_skipped); + printf("%d of %d tests passed (%d malformed, %d skipped)\n", + passed, tests, invalid, total_skipped); - if (skip > 0) - { + if (skip > 0) { printf("WARN: skipped past the end of file, exiting with status 2\n"); exit(2); } - if (passed != tests) - exit(1); + if (passed != tests) exit(1); } -static void jv_test() -{ + +static void jv_test() { /// JSON parser regression tests { jv v = jv_parse("{\"a':\"12\"}"); @@ -332,6 +273,7 @@ static void jv_test() assert(!jv_equal(jv_copy(a2), jv_copy(a))); jv_free(a2); + assert(jv_get_refcnt(a) == 1); a = jv_array_append(a, jv_copy(a)); assert(jv_get_refcnt(a) == 1); @@ -339,8 +281,7 @@ static void jv_test() assert(jv_array_length(jv_copy(a)) == 2); assert(jv_number_value(jv_array_get(jv_copy(a), 0)) == 42); - for (int i = 0; i < 10; i++) - { + for (int i=0; i<10; i++) { jv subarray = jv_array_get(jv_copy(a), 1); assert(jv_get_kind(subarray) == JV_KIND_ARRAY); assert(jv_array_length(jv_copy(subarray)) == 1); @@ -348,6 +289,7 @@ static void jv_test() jv_free(subarray); } + jv subarray = jv_array_get(jv_copy(a), 1); assert(jv_get_kind(subarray) == JV_KIND_ARRAY); assert(jv_array_length(jv_copy(subarray)) == 1); @@ -367,9 +309,9 @@ static void jv_test() jv_free(subarray); - void *before = sub2.u.ptr; + void* before = sub2.u.ptr; sub2 = jv_array_append(sub2, jv_number(200)); - void *after = sub2.u.ptr; + void* after = sub2.u.ptr; assert(before == after); jv_free(sub2); @@ -380,6 +322,7 @@ static void jv_test() assert(jv_number_value(jv_array_get(jv_copy(a3), 2)) == 19); jv_free(a3); + jv a4 = jv_array(); a4 = jv_array_append(a4, jv_number(1)); a4 = jv_array_append(a4, jv_number(2)); @@ -393,14 +336,17 @@ static void jv_test() jv_free(a4); jv_free(a5); + assert(jv_array_length(jv_copy(a)) == 2); assert(jv_number_value(jv_array_get(jv_copy(a), 0)) == 42); assert(jv_array_length(jv_array_get(jv_copy(a), 1)) == 1); - // jv_dump(jv_copy(a), 0); printf("\n"); + + //jv_dump(jv_copy(a), 0); printf("\n"); jv_free(a); } + /// Strings { assert(jv_equal(jv_string("foo"), jv_string_sized("foo", 3))); @@ -411,6 +357,7 @@ static void jv_test() jv_free(shortstr); jv_free(longstr); + char a1s[] = "hello", a2s[] = "hello", bs[] = "goodbye"; jv a1 = jv_string(a1s), a2 = jv_string(a2s), b = jv_string(bs); assert(jv_equal(jv_copy(a1), jv_copy(a2))); @@ -426,9 +373,8 @@ static void jv_test() assert(jv_equal(jv_string("hello42!"), jv_string_fmt("hello%d%s", 42, "!"))); char big[20000]; - for (int i = 0; i < (int)sizeof(big); i++) - big[i] = 'a'; - big[sizeof(big) - 1] = 0; + for (int i=0; i<(int)sizeof(big); i++) big[i] = 'a'; + big[sizeof(big)-1] = 0; jv str = jv_string_fmt("%s", big); assert(jv_string_length_bytes(jv_copy(str)) == sizeof(big) - 1); assert(!strcmp(big, jv_string_value(str))); @@ -451,7 +397,7 @@ static void jv_test() jv_free(o1); assert(jv_number_value(jv_object_get(jv_copy(o2), jv_string("bar"))) == 240); - // jv_dump(jv_copy(o2), 0); printf("\n"); + //jv_dump(jv_copy(o2), 0); printf("\n"); jv_free(o2); } } |