Changeset 851f33a in mainline

Timestamp:

2010-06-24T09:07:32Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

ccb426c

Parents:

9539be6

Message:

merge "tests" and "test" kconsole commands

File:

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

kernel/generic/src/console/cmd.c

@@ -108 +108 @@
 
 #ifdef CONFIG_TEST
-static int cmd_tests(cmd_arg_t *argv);
-static cmd_info_t tests_info = {
-        .name = "tests",
-        .description = "Print available kernel tests.",
-        .func = cmd_tests,
-        .argc = 0
-};
-
 static char test_buf[MAX_CMDLINE + 1];
 static int cmd_test(cmd_arg_t *argv);
 static cmd_arg_t test_argv[] = {
         {
-                .type = ARG_TYPE_STRING,
+                .type = ARG_TYPE_STRING_OPTIONAL,
                 .buffer = test_buf,
                 .len = sizeof(test_buf)
@@ -127 +119 @@
 static cmd_info_t test_info = {
         .name = "test",
-        .description = "Run kernel test.",
+        .description = "Print list of kernel tests or run a test.",
         .func = cmd_test,
         .argc = 1,
@@ -509 +501 @@
         &zone_info,
 #ifdef CONFIG_TEST
-        &tests_info,
         &test_info,
         &bench_info,
@@ -1066 +1057 @@
 
 #ifdef CONFIG_TEST
-/** Command for printing kernel tests list.
- *
- * @param argv Ignored.
- *
- * return Always 1.
- */
-int cmd_tests(cmd_arg_t *argv)
-{
-        size_t len = 0;
-        test_t *test;
-        for (test = tests; test->name != NULL; test++) {
-                if (str_length(test->name) > len)
-                        len = str_length(test->name);
-        }
-        
-        for (test = tests; test->name != NULL; test++)
-                printf("%-*s %s%s\n", len, test->name, test->desc, (test->safe ? "" : " (unsafe)"));
-        
-        printf("%-*s Run all safe tests\n", len, "*");
-        return 1;
-}
-
 static bool run_test(const test_t *test)
 {
@@ -1193 +1162 @@
 }
 
-/** Command for returning kernel tests
+static void list_tests(void)
+{
+        size_t len = 0;
+        test_t *test;
+        
+        for (test = tests; test->name != NULL; test++) {
+                if (str_length(test->name) > len)
+                        len = str_length(test->name);
+        }
+        
+        for (test = tests; test->name != NULL; test++)
+                printf("%-*s %s%s\n", len, test->name, test->desc, (test->safe ? "" : " (unsafe)"));
+        
+        printf("%-*s Run all safe tests\n", len, "*");
+}
+
+/** Command for listing and running kernel tests
  *
  * @param argv Argument vector.
  *
  * return Always 1.
+ *
  */
 int cmd_test(cmd_arg_t *argv)
@@ -1211 +1197 @@
                         }
                 }
-        } else {
+        } else if (str_cmp((char *) argv->buffer, "") != 0) {
                 bool fnd = false;
                 
@@ -1224 +1210 @@
                 if (!fnd)
                         printf("Unknown test\n");
-        }
+        } else
+                list_tests();
         
         return 1;