Changeset 34db7fa in mainline for kernel/generic/src/console/cmd.c

Timestamp:

2006-12-12T12:32:02Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

96348adc

Parents:

df496c5

Message:

cleanup kernel tests infrastructure

File:

• kernel/generic/src/console/cmd.c (modified) (5 diffs)

kernel/generic/src/console/cmd.c

@@ -68 +68 @@
 #ifdef CONFIG_TEST
 #include <test.h>
+#endif
+
+#ifdef CONFIG_BENCH
+#include <arch/cycle.h>
 #endif
 
@@ -859 +863 @@
 }
 
+static bool run_test(const test_t * test)
+{
+        printf("%s\t\t%s\n", test->name, test->desc);
+#ifdef CONFIG_BENCH
+        uint64_t t0 = get_cycle();
+#endif
+        char * ret = test->entry();
+#ifdef CONFIG_BENCH
+        uint64_t dt = get_cycle() - t0;
+        printf("Time: %llu cycles\n", dt);
+#endif
+        
+        if (ret == NULL) {
+                printf("Test passed\n");
+                return true;
+        }
+
+        printf("%s\n", ret);
+        return false;
+}
+
 /** Command for returning kernel tests
  *
@@ -872 +897 @@
                 for (test = tests; test->name != NULL; test++) {
                         if (test->safe) {
-                                printf("\n%s\t\t%s\n\n", test->name, test->desc);
-                                test->entry();
+                                printf("\n");
+                                if (!run_test(test))
+                                        break;
                         }
                 }
@@ -882 +908 @@
                         if (strcmp(test->name, argv->buffer) == 0) {
                                 fnd = true;
-                                test->entry();
+                                run_test(test);
                                 break;
                         }
@@ -888 +914 @@
                 
                 if (!fnd)
-                        printf("Unknown test.\n");
+                        printf("Unknown test\n");
         }