X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Futils%2Ftap%2Ftap.c;h=1ef417fed34a70b4897918815c2c783db4840fd5;hb=2a69bf1437eb7e81979a1410b1a66a960b52caeb;hp=9f41408bd4c4dd25a729b607b4c276bb115ab27b;hpb=9f4a25d35d037cbb5d8aeb50f9e8fa10748a4d14;p=lttng-tools.git diff --git a/tests/utils/tap/tap.c b/tests/utils/tap/tap.c index 9f41408bd..1ef417fed 100644 --- a/tests/utils/tap/tap.c +++ b/tests/utils/tap/tap.c @@ -5,15 +5,18 @@ * Copyright (C) 2017 Jérémie Galarneau */ +#include "../utils.h" +#include "common/compat/time.hpp" +#include "tap.h" + +#include #include +#include #include #include #include #include -#include -#include - -#include "tap.h" +#include static int no_plan = 0; static int skip_all = 0; @@ -25,17 +28,19 @@ static char *todo_msg = NULL; static const char *todo_msg_fixed = "libtap malloc issue"; static int todo = 0; static int test_died = 0; +static int time_tests = 1; +struct timespec last_time; /* Encapsulate the pthread code in a conditional. In the absence of libpthread the code does nothing */ #ifdef HAVE_LIBPTHREAD #include static pthread_mutex_t M = PTHREAD_MUTEX_INITIALIZER; -# define LOCK pthread_mutex_lock(&M); -# define UNLOCK pthread_mutex_unlock(&M); +#define LOCK pthread_mutex_lock(&M); +#define UNLOCK pthread_mutex_unlock(&M); #else -# define LOCK -# define UNLOCK +#define LOCK +#define UNLOCK #endif static void _expected_tests(unsigned int); @@ -43,14 +48,14 @@ static void _tap_init(void); static void _cleanup(void); #ifdef __MINGW32__ -static inline -void flockfile (FILE * filehandle) { - return; +static inline void flockfile(FILE *filehandle) +{ + return; } -static inline -void funlockfile(FILE * filehandle) { - return; +static inline void funlockfile(FILE *filehandle) +{ + return; } #endif @@ -61,9 +66,8 @@ void funlockfile(FILE * filehandle) { * test_name -- the name of the test, may be NULL * test_comment -- a comment to print afterwards, may be NULL */ -unsigned int -_gen_result(int ok, const char *func, const char *file, unsigned int line, - const char *test_name, ...) +unsigned int _gen_result( + int ok, const char *func, const char *file, unsigned int line, const char *test_name, ...) { va_list ap; char *local_test_name = NULL; @@ -76,7 +80,7 @@ _gen_result(int ok, const char *func, const char *file, unsigned int line, /* Start by taking the test name and performing any printf() expansions on it */ - if(test_name != NULL) { + if (test_name != NULL) { va_start(ap, test_name); if (vasprintf(&local_test_name, test_name, ap) == -1) { local_test_name = NULL; @@ -86,43 +90,44 @@ _gen_result(int ok, const char *func, const char *file, unsigned int line, /* Make sure the test name contains more than digits and spaces. Emit an error message and exit if it does */ - if(local_test_name) { + if (local_test_name) { name_is_digits = 1; - for(c = local_test_name; *c != '\0'; c++) { - if(!isdigit((unsigned char) *c) && !isspace((unsigned char) *c)) { + for (c = local_test_name; *c != '\0'; c++) { + if (!isdigit((unsigned char) *c) && !isspace((unsigned char) *c)) { name_is_digits = 0; break; } } - if(name_is_digits) { - diag(" You named your test '%s'. You shouldn't use numbers for your test names.", local_test_name); + if (name_is_digits) { + diag(" You named your test '%s'. You shouldn't use numbers for your test names.", + local_test_name); diag(" Very confusing."); } } } - if(!ok) { + if (!ok) { printf("not "); failures++; } printf("ok %d", test_count); - if(test_name != NULL) { + if (test_name != NULL) { printf(" - "); /* Print the test name, escaping any '#' characters it might contain */ - if(local_test_name != NULL) { + if (local_test_name != NULL) { flockfile(stdout); - for(c = local_test_name; *c != '\0'; c++) { - if(*c == '#') + for (c = local_test_name; *c != '\0'; c++) { + if (*c == '#') fputc('\\', stdout); - fputc((int)*c, stdout); + fputc((int) *c, stdout); } funlockfile(stdout); - } else { /* vasprintf() failed, use a fixed message */ + } else { /* vasprintf() failed, use a fixed message */ printf("%s", todo_msg_fixed); } } @@ -134,20 +139,24 @@ _gen_result(int ok, const char *func, const char *file, unsigned int line, This is not counted as a failure, so decrement the counter if the test failed. */ - if(todo) { + if (todo) { printf(" # TODO %s", todo_msg ? todo_msg : todo_msg_fixed); - if(!ok) + if (!ok) failures--; } printf("\n"); + _output_test_time(); - if(!ok) { - if(getenv("HARNESS_ACTIVE") != NULL) + if (!ok) { + if (getenv("HARNESS_ACTIVE") != NULL) fputs("\n", stderr); diag(" Failed %stest (%s:%s() at line %d)", - todo ? "(TODO) " : "", file, func, line); + todo ? "(TODO) " : "", + file, + func, + line); } free(local_test_name); @@ -162,34 +171,41 @@ _gen_result(int ok, const char *func, const char *file, unsigned int line, * Initialise the TAP library. Will only do so once, however many times it's * called. */ -void -_tap_init(void) +void _tap_init(void) { static int run_once = 0; - if(!run_once) { + if (!run_once) { atexit(_cleanup); /* stdout needs to be unbuffered so that the output appears in the same place relative to stderr output as it does with Test::Harness */ setbuf(stdout, 0); + + char *autotime_env = getenv("TAP_AUTOTIME"); + if (autotime_env != NULL) { + time_tests = atoi(autotime_env); + if (time_tests != 0) { + time_tests = 1; + } + } + run_once = 1; } + lttng_clock_gettime(CLOCK_MONOTONIC, &last_time); } /* * Note that there's no plan. */ -int -plan_no_plan(void) +int plan_no_plan(void) { - LOCK; _tap_init(); - if(have_plan != 0) { + if (have_plan != 0) { fprintf(stderr, "You tried to plan twice!\n"); test_died = 1; UNLOCK; @@ -207,10 +223,8 @@ plan_no_plan(void) /* * Note that the plan is to skip all tests */ -int -plan_skip_all(const char *reason) +int plan_skip_all(const char *reason) { - LOCK; _tap_init(); @@ -219,7 +233,7 @@ plan_skip_all(const char *reason) printf("1..0"); - if(reason != NULL) + if (reason != NULL) printf(" # Skip %s", reason); printf("\n"); @@ -232,22 +246,20 @@ plan_skip_all(const char *reason) /* * Note the number of tests that will be run. */ -int -plan_tests(unsigned int tests) +int plan_tests(unsigned int tests) { - LOCK; _tap_init(); - if(have_plan != 0) { + if (have_plan != 0) { fprintf(stderr, "You tried to plan twice!\n"); test_died = 1; UNLOCK; exit(255); } - if(tests == 0) { + if (tests == 0) { fprintf(stderr, "You said to run 0 tests! You've got to run something.\n"); test_died = 1; UNLOCK; @@ -263,8 +275,7 @@ plan_tests(unsigned int tests) return e_tests; } -unsigned int -diag(const char *fmt, ...) +unsigned int diag(const char *fmt, ...) { va_list ap; @@ -279,8 +290,7 @@ diag(const char *fmt, ...) return 0; } -void -diag_multiline(const char *val) +void diag_multiline(const char *val) { size_t len, i, line_start_idx = 0; @@ -301,16 +311,13 @@ diag_multiline(const char *val) } } -void -_expected_tests(unsigned int tests) +void _expected_tests(unsigned int tests) { - printf("1..%d\n", tests); e_tests = tests; } -int -skip(unsigned int n, const char *fmt, ...) +int skip(unsigned int n, const char *fmt, ...) { va_list ap; char *skip_msg = NULL; @@ -323,11 +330,12 @@ skip(unsigned int n, const char *fmt, ...) } va_end(ap); - while(n-- > 0) { + while (n-- > 0) { test_count++; - printf("ok %d # skip %s\n", test_count, - skip_msg != NULL ? - skip_msg : "libtap():malloc() failed"); + printf("ok %d # skip %s\n", + test_count, + skip_msg != NULL ? skip_msg : "libtap():malloc() failed"); + _output_test_time(); } free(skip_msg); @@ -337,8 +345,21 @@ skip(unsigned int n, const char *fmt, ...) return 1; } -void -todo_start(const char *fmt, ...) +void _output_test_time(void) +{ + struct timespec new_time; + int64_t time_ns; + if (time_tests) { + lttng_clock_gettime(CLOCK_MONOTONIC, &new_time); + time_ns = elapsed_time_ns(&last_time, &new_time); + printf(" ---\n duration_ms: %ld.%ld\n ...\n", + time_ns / 1000000, + time_ns % 1000000); + } + lttng_clock_gettime(CLOCK_MONOTONIC, &last_time); +} + +void todo_start(const char *fmt, ...) { va_list ap; @@ -355,10 +376,8 @@ todo_start(const char *fmt, ...) UNLOCK; } -void -todo_end(void) +void todo_end(void) { - LOCK; todo = 0; @@ -367,22 +386,21 @@ todo_end(void) UNLOCK; } -int -exit_status(void) +int exit_status(void) { int r; LOCK; /* If there's no plan, just return the number of failures */ - if(no_plan || !have_plan) { + if (no_plan || !have_plan) { UNLOCK; return failures; } /* Ran too many tests? Return the number of tests that were run that shouldn't have been */ - if(e_tests < test_count) { + if (e_tests < test_count) { r = test_count - e_tests; UNLOCK; return r; @@ -400,51 +418,54 @@ exit_status(void) * Cleanup at the end of the run, produce any final output that might be * required. */ -void -_cleanup(void) +void _cleanup(void) { - LOCK; /* If plan_no_plan() wasn't called, and we don't have a plan, and we're not skipping everything, then something happened before we could produce any output */ - if(!no_plan && !have_plan && !skip_all) { + if (!no_plan && !have_plan && !skip_all) { diag("Looks like your test died before it could output anything."); UNLOCK; return; } - if(test_died) { + if (test_died) { diag("Looks like your test died just after %d.", test_count); UNLOCK; return; } - /* No plan provided, but now we know how many tests were run, and can print the header at the end */ - if(!skip_all && (no_plan || !have_plan)) { + if (!skip_all && (no_plan || !have_plan)) { printf("1..%d\n", test_count); } - if((have_plan && !no_plan) && e_tests < test_count) { + if ((have_plan && !no_plan) && e_tests < test_count) { diag("Looks like you planned %d %s but ran %d extra.", - e_tests, e_tests == 1 ? "test" : "tests", test_count - e_tests); + e_tests, + e_tests == 1 ? "test" : "tests", + test_count - e_tests); UNLOCK; return; } - if((have_plan || !no_plan) && e_tests > test_count) { + if ((have_plan || !no_plan) && e_tests > test_count) { diag("Looks like you planned %d %s but only ran %d.", - e_tests, e_tests == 1 ? "test" : "tests", test_count); + e_tests, + e_tests == 1 ? "test" : "tests", + test_count); UNLOCK; return; } - if(failures) + if (failures) diag("Looks like you failed %d %s of %d.", - failures, failures == 1 ? "test" : "tests", test_count); + failures, + failures == 1 ? "test" : "tests", + test_count); UNLOCK; }