Changeset 50661ab in mainline

Timestamp:

2006-12-11T19:00:04Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

f272cb8

Parents:

319e60e

Message:

integrate more tests

Location:

kernel

Files:

• Makefile (modified) (1 diff)
• generic/src/console/cmd.c (modified) (3 diffs)
• kernel.config (modified) (1 diff)
• test/atomic/atomic1.c (modified) (1 diff)
• test/btree/btree1.c (moved) (moved from kernel/test/btree/btree1/test.c ) (2 diffs)
• test/debug/mips1.c (moved) (moved from kernel/test/debug/mips1/test.c ) (2 diffs)
• test/fault/fault1.c (moved) (moved from kernel/test/fault/fault1/test.c ) (1 diff)
• test/fpu/fpu1.c (moved) (moved from kernel/test/fpu/fpu1/test.c ) (3 diffs)
• test/test.c (modified) (1 diff)
• test/test.h (modified) (1 diff)

kernel/Makefile

@@ -214 +214 @@
 #
 
-ifneq ($(CONFIG_TEST),)
+ifeq ($(CONFIG_TEST),y)
         DEFS += -DCONFIG_TEST
         CFLAGS += -Itest/
         GENERIC_SOURCES += \
                 test/test.c \
-                test/atomic/atomic1.c
+                test/atomic/atomic1.c \
+                test/btree/btree1.c \
+                test/debug/mips1.c \
+                test/fault/fault1.c \
+                test/fpu/fpu1.c
 endif
 

kernel/generic/src/console/cmd.c

@@ -841 +841 @@
 }
 
+#ifdef CONFIG_TEST
 /** Command for printing kernel tests list.
  *
@@ -852 +853 @@
         
         for (test = tests; test->name != NULL; test++)
-                printf("%s\t%s\n", test->name, test->desc);
-        
+                printf("%s\t\t%s%s\n", test->name, test->desc, (test->safe ? "" : " (unsafe)"));
+        
+        printf("*\t\tRun all safe tests\n");
         return 1;
 }
@@ -865 +867 @@
 int cmd_test(cmd_arg_t *argv)
 {
-        bool fnd = false;
         test_t *test;
         
-        for (test = tests; test->name != NULL; test++) {
-                if (strcmp(test->name, argv->buffer) == 0) {
-                        fnd = true;
-                        test->entry();
-                        break;
+        if (strcmp(argv->buffer, "*") == 0) {
+                for (test = tests; test->name != NULL; test++) {
+                        if (test->safe) {
+                                printf("\n%s\t\t%s\n\n", test->name, test->desc);
+                                test->entry();
+                        }
                 }
-        }
-        
-        if (!fnd)
-                printf("Unknown test.\n");
-        
-        return 1;
-}
+        } else {
+                bool fnd = false;
+                
+                for (test = tests; test->name != NULL; test++) {
+                        if (strcmp(test->name, argv->buffer) == 0) {
+                                fnd = true;
+                                test->entry();
+                                break;
+                        }
+                }
+                
+                if (!fnd)
+                        printf("Unknown test.\n");
+        }
+        
+        return 1;
+}
+#endif
 
 /** @}

kernel/kernel.config

@@ -123 +123 @@
 
 # Benchmark tests
-! [CONFIG_TEST!=] CONFIG_BENCH (y/n)
+! [CONFIG_TEST=y] CONFIG_BENCH (y/n)

kernel/test/atomic/atomic1.c

@@ -64 +64 @@
         printf("Time: %.*d cycles\n", sizeof(dt) * 2, dt);
 #endif
-        return;
 }

kernel/test/btree/btree1.c

@@ -32 +32 @@
 #include <debug.h>
 
+#ifdef CONFIG_BENCH
+#include <arch/cycle.h>
+#endif
+
 void *data = (void *) 0xdeadbeef;
 
-void test(void)
+void test_btree1(void)
 {
+#ifdef CONFIG_BENCH
+        uint64_t t0 = get_cycle();
+#endif
         btree_t t;
         int i;
@@ -157 +164 @@
 
         btree_print(&t);
+#ifdef CONFIG_BENCH
+        uint64_t dt = get_cycle() - t0;
+        printf("Time: %.*d cycles\n", sizeof(dt) * 2, dt);
+#endif
 }

kernel/test/debug/mips1.c

@@ -39 +39 @@
 
 
-void test(void)
+void test_mips1(void)
 {
+#ifdef mips32
         printf("MIPS debug test #1\n");
 
@@ -48 +49 @@
 
         printf("Test passed.\n");
+#else
+        printf("This test is availaible only on MIPS32 platform.\n");
+#endif
 }

kernel/test/fault/fault1.c

@@ -39 +39 @@
 
 
-void test(void)
+void test_fault1(void)
 {
 

kernel/test/fpu/fpu1.c

@@ -39 +39 @@
 #include <arch/arch.h>
 
+#ifdef CONFIG_BENCH
+#include <arch/cycle.h>
+#endif
+
+#if (defined(ia32) || defined(amd64) || defined(ia64) || defined(ia32xen))
+
 #define THREADS         150*2
 #define ATTEMPTS        100
@@ -149 +155 @@
 }
 
-void test(void)
-{
+void test_fpu1(void)
+{
+#ifdef CONFIG_BENCH
+        uint64_t t0 = get_cycle();
+#endif
         thread_t *t;
         int i;
@@ -176 +185 @@
                 
         printf("Test passed.\n");
-}
+#ifdef CONFIG_BENCH
+        uint64_t dt = get_cycle() - t0;
+        printf("Time: %.*d cycles\n", sizeof(dt) * 2, dt);
+#endif
+}
+
+#else
+
+void test_fpu1(void)
+{
+        printf("This test is available only on Intel/AMD platforms.");
+}
+
+#endif

kernel/test/test.c

@@ -39 +39 @@
                 "atomic1",
                 "Test atomic operations",
-                &test_atomic1
+                &test_atomic1,
+                true
+        },
+        {
+                "btree1",
+                "Test B-tree operations",
+                &test_btree1,
+                true
+        },
+        {
+                "mips1",
+                "MIPS debug test",
+                &test_mips1,
+                true
+        },
+        {
+                "fault1",
+                "Write to NULL (maybe page fault)",
+                &test_fault1,
+                false
+        },
+        {
+                "fpu1",
+                "Intel FPU test",
+                &test_fpu1,
+                true
         },
         {NULL, NULL, NULL}

kernel/test/test.h

@@ -43 +43 @@
         char * desc;
         function entry;
+        bool safe;
 } test_t;
 
 extern void test_atomic1(void);
+extern void test_btree1(void);
+extern void test_mips1(void);
+extern void test_fault1(void);
+extern void test_fpu1(void);
 
 extern test_t tests[];