718e228ad
Bartosz Golaszewski
2015-08-17
Subject
unit-tests: remove code depending on WANT_TIMING
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
libbb/bbunit.c+3 -27
| @@ -17,8 +17,6 @@ | |
| #include "libbb.h" | |
| - | #define WANT_TIMING 0 |
| - | |
| static llist_t *tests = NULL; | |
| static unsigned tests_registered = 0; | |
| static int test_retval; | |
| @@ -34,38 +32,22 @@ void bbunit_settestfailed(void) | |
| test_retval = -1; | |
| } | |
| - | #if WANT_TIMING |
| - | static void timeval_diff(struct timeval* res, |
| - | const struct timeval* x, |
| - | const struct timeval* y) |
| - | { |
| - | long udiff = x->tv_usec - y->tv_usec; |
| - | |
| - | res->tv_sec = x->tv_sec - y->tv_sec - (udiff < 0); |
| - | res->tv_usec = (udiff >= 0 ? udiff : udiff + 1000000); |
| - | } |
| - | #endif |
| - | |
| int unit_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) MAIN_EXTERNALLY_VISIBLE; | |
| int unit_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) | |
| { | |
| unsigned tests_run = 0; | |
| unsigned tests_failed = 0; | |
| - | #if WANT_TIMING |
| - | struct timeval begin; |
| - | struct timeval end; |
| - | struct timeval time_spent; |
| - | gettimeofday(&begin, NULL); |
| - | #endif |
| bb_error_msg("Running %d test(s)...", tests_registered); | |
| for (;;) { | |
| struct bbunit_listelem* el = llist_pop(&tests); | |
| if (!el) | |
| break; | |
| + | |
| bb_error_msg("Case: [%s]", el->name); | |
| test_retval = 0; | |
| el->testfunc(); | |
| + | |
| if (test_retval < 0) { | |
| bb_error_msg("[ERROR] [%s]: TEST FAILED", el->name); | |
| tests_failed++; | |
| @@ -73,17 +55,11 @@ int unit_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) | |
| tests_run++; | |
| } | |
| - | #if WANT_TIMING |
| - | gettimeofday(&end, NULL); |
| - | timeval_diff(&time_spent, &end, &begin); |
| - | bb_error_msg("Elapsed time %u.%06u seconds", |
| - | (int)time_spent.tv_sec, |
| - | (int)time_spent.tv_usec); |
| - | #endif |
| if (tests_failed > 0) { | |
| bb_error_msg("[ERROR] %u test(s) FAILED", tests_failed); | |
| return EXIT_FAILURE; | |
| } | |
| + | |
| bb_error_msg("All tests passed"); | |
| return EXIT_SUCCESS; | |
| } | |