ash: builtin: Mark more regular built-ins

[oweals/busybox.git] / libbb / bbunit.c

diff --git a/libbb/bbunit.c b/libbb/bbunit.c
index 256014441ea79871b639bf58d93b853a7c8adb65..ccd909d78a493aba09316181a12cb2c020cc5bbb 100644 (file)
--- a/libbb/bbunit.c
+++ b/libbb/bbunit.c
@@ -6,9 +6,9 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+//applet:IF_UNIT_TEST(APPLET(unit, BB_DIR_USR_BIN, BB_SUID_DROP))
 
 //kbuild:lib-$(CONFIG_UNIT_TEST) += bbunit.o
-//applet:IF_UNIT_TEST(APPLET(unit, BB_DIR_USR_BIN, BB_SUID_DROP))
 
 //usage:#define unit_trivial_usage
 //usage:       ""
@@ -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,57 +32,34 @@ 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++;
                }
                tests_run++;
-               el = el->next;
        }
 
-#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");
+
+       bb_simple_error_msg("All tests passed");
        return EXIT_SUCCESS;
 }