diff options
author | brane <brane@13f79535-47bb-0310-9956-ffa450edef68> | 2020-05-06 15:36:49 +0000 |
---|---|---|
committer | brane <brane@13f79535-47bb-0310-9956-ffa450edef68> | 2020-05-06 15:36:49 +0000 |
commit | 70e1a5421d2db9a00e3a5a59c321965f66136f93 (patch) | |
tree | 8e8e899a0d7bd93126ba7dcb20c211da4bcac9b4 | |
parent | d304f14fb8959d73afae35670136c87bf248fae6 (diff) | |
download | libapr-70e1a5421d2db9a00e3a5a59c321965f66136f93.tar.gz |
Added support for recording skipped test cases.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@1877441 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | test/abts.c | 67 | ||||
-rw-r--r-- | test/abts.h | 9 | ||||
-rw-r--r-- | test/testdir.c | 3 | ||||
-rw-r--r-- | test/testfile.c | 3 |
4 files changed, 71 insertions, 11 deletions
diff --git a/test/abts.c b/test/abts.c index cab2e1aa0..3c5660fc2 100644 --- a/test/abts.c +++ b/test/abts.c @@ -76,6 +76,10 @@ static void end_suite(abts_suite *suite) fprintf(stdout, "\b"); fflush(stdout); } + if (last->skipped > 0) { + fprintf(stdout, "SKIPPED %d of %d\n", last->skipped, last->num_test); + fflush(stdout); + } if (last->failed == 0) { fprintf(stdout, "SUCCESS\n"); fflush(stdout); @@ -102,6 +106,7 @@ abts_suite *abts_add_suite(abts_suite *suite, const char *suite_name_full) subsuite = malloc(sizeof(*subsuite)); subsuite->num_test = 0; subsuite->failed = 0; + subsuite->skipped = 0; subsuite->next = NULL; /* suite_name_full may be an absolute path depending on __FILE__ * expansion */ @@ -163,6 +168,7 @@ void abts_run_test(abts_suite *ts, test_func f, void *value) ss = ts->tail; tc.failed = 0; + tc.skipped = 0; tc.suite = ss; ss->num_test++; @@ -173,11 +179,25 @@ void abts_run_test(abts_suite *ts, test_func f, void *value) if (tc.failed) { ss->failed++; } + + if (tc.skipped) { + ss->skipped++; + } +} + +static void report_summary(const char *kind_header, + const char *name_header, + const char *percent_header) +{ + fprintf(stdout, "%-15s\t\tTotal\t%s\t%s\n", + kind_header, name_header, percent_header); + fprintf(stdout, "===================================================\n"); } static int report(abts_suite *suite) { - int count = 0; + int failed_count = 0; + int skipped_count = 0; sub_suite *dptr; if (suite && suite->tail &&!suite->tail->not_run) { @@ -185,25 +205,46 @@ static int report(abts_suite *suite) } for (dptr = suite->head; dptr; dptr = dptr->next) { - count += dptr->failed; + failed_count += dptr->failed; + } + + for (dptr = suite->head; dptr; dptr = dptr->next) { + skipped_count += dptr->skipped; } if (list_tests) { return 0; } - if (count == 0) { + /* Report skipped tests */ + if (skipped_count > 0) { + dptr = suite->head; + report_summary("Skipped Tests", "Skip", "Skipped %"); + while (dptr != NULL) { + if (dptr->skipped != 0) { + float percent = ((float)dptr->skipped / (float)dptr->num_test); + fprintf(stdout, "%-15s\t\t%5d\t%4d\t%8.2f%%\n", dptr->name, + dptr->num_test, dptr->skipped, percent * 100); + } + dptr = dptr->next; + } + } + + if (failed_count == 0) { printf("All tests passed.\n"); return 0; } + /* Report failed tests */ dptr = suite->head; - fprintf(stdout, "%-15s\t\tTotal\tFail\tFailed %%\n", "Failed Tests"); - fprintf(stdout, "===================================================\n"); + if (skipped_count > 0) { + fprintf(stdout, "\n"); + } + report_summary("Failed Tests", "Fail", " Failed %"); while (dptr != NULL) { if (dptr->failed != 0) { float percent = ((float)dptr->failed / (float)dptr->num_test); - fprintf(stdout, "%-15s\t\t%5d\t%4d\t%6.2f%%\n", dptr->name, + fprintf(stdout, "%-15s\t\t%5d\t%4d\t%8.2f%%\n", dptr->name, dptr->num_test, dptr->failed, percent * 100); } dptr = dptr->next; @@ -341,7 +382,19 @@ void abts_fail(abts_case *tc, const char *message, int lineno) fflush(stderr); } } - + +void abts_skip(abts_case *tc, const char *message, int lineno) +{ + update_status(); + if (tc->skipped) return; + + tc->skipped = TRUE; + if (verbose) { + fprintf(stderr, "\bSKIP: Line %d: %s\n", lineno, message); + fflush(stderr); + } +} + void abts_assert(abts_case *tc, const char *message, int condition, int lineno) { update_status(); diff --git a/test/abts.h b/test/abts.h index 7385ca957..d4603ae34 100644 --- a/test/abts.h +++ b/test/abts.h @@ -42,6 +42,7 @@ struct sub_suite { const char *name; int num_test; int failed; + int skipped; int not_run; int not_impl; struct sub_suite *next; @@ -56,6 +57,7 @@ typedef struct abts_suite abts_suite; struct abts_case { int failed; + int skipped; sub_suite *suite; }; typedef struct abts_case abts_case; @@ -77,6 +79,7 @@ void abts_ptr_notnull(abts_case *tc, const void *ptr, int lineno); void abts_ptr_equal(abts_case *tc, const void *expected, const void *actual, int lineno); void abts_true(abts_case *tc, int condition, int lineno); void abts_fail(abts_case *tc, const char *message, int lineno); +void abts_skip(abts_case *tc, const char *message, int lineno); void abts_not_impl(abts_case *tc, const char *message, int lineno); void abts_assert(abts_case *tc, const char *message, int condition, int lineno); void abts_size_equal(abts_case *tc, size_t expected, size_t actual, int lineno); @@ -95,6 +98,12 @@ void abts_size_equal(abts_case *tc, size_t expected, size_t actual, int lineno); #define ABTS_SIZE_EQUAL(a, b, c) abts_size_equal(a, b, c, __LINE__) +/* When skipping tests, make a reference to the test data parameter + to avoid unused variable warnings. */ +#define ABTS_SKIP(tc, data, msg) do { \ + ((void)(data)); \ + abts_skip((tc), (msg), __LINE__); \ + } while (0) abts_suite *run_tests(abts_suite *suite); abts_suite *run_tests1(abts_suite *suite); diff --git a/test/testdir.c b/test/testdir.c index cdb19f3e8..3ad4ba0ce 100644 --- a/test/testdir.c +++ b/test/testdir.c @@ -132,8 +132,7 @@ static void test_mkdir_recurs_parallel(abts_case *tc, void *data) ABTS_INT_EQUAL(tc, APR_SUCCESS, s3); ABTS_INT_EQUAL(tc, APR_SUCCESS, s4); #else - (void)tc; - (void)data; + ABTS_SKIP(tc, data, "This test requires APR thread support."); #endif /* APR_HAS_THREADS */ } diff --git a/test/testfile.c b/test/testfile.c index e18e4d121..07534b622 100644 --- a/test/testfile.c +++ b/test/testfile.c @@ -1757,8 +1757,7 @@ static void test_atomic_append(abts_case *tc, void *data) apr_file_remove(fname, p); #else - (void)tc; - (void)data; + ABTS_SKIP(tc, data, "This test requires APR thread support."); #endif /* APR_HAS_THREADS */ } |