Changeset 7e13972 in mainline for kernel/test/mm

Timestamp:

2006-12-12T18:51:06Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

cce6acf

Parents:

96348adc

Message:

remove asserts and panics from tests

Location:

kernel/test/mm

Files:

• falloc1.c (modified) (1 diff)
• mapping1.c (modified) (2 diffs)
• slab1.c (modified) (1 diff)
• slab2.c (modified) (2 diffs)

kernel/test/mm/falloc1.c

@@ -47 +47 @@
         int i, order, run;
         int allocated;
-
-        ASSERT(TEST_RUNS > 1);
+        
+        if (TEST_RUNS < 2)
+                return "Test is compiled with TEST_RUNS < 2";
+        
         if (frames == NULL)
                 return "Unable to allocate frames";

kernel/test/mm/mapping1.c

@@ -63 +63 @@
         printf("Value at virtual address %p is %#x.\n", PAGE1, v1 = *((uint32_t *) PAGE1));
         
-        ASSERT(v0 == VALUE0);
-        ASSERT(v1 == VALUE1);
+        if (v0 != VALUE0)
+                return "Value at v0 not equal to VALUE0";
+        if (v1 != VALUE1)
+                return "Value at v1 not equal to VALUE1";
 
         printf("Writing %#x to virtual address %p.\n", 0, PAGE0);
@@ -77 +79 @@
         printf("Value at virtual address %p is %#x.\n", PAGE1, *((uint32_t *) PAGE1));
 
-        ASSERT(v0 == 0);
-        ASSERT(v1 == 0);
+        if (v0 != 0)
+                return "Value at v0 not equal to 0";
+        if (v1 != 0)
+                return "Value at v1 not equal to 0";
         
         return NULL;    

kernel/test/mm/slab1.c

@@ -32 +32 @@
 #include <proc/thread.h>
 #include <arch.h>
-#include <panic.h>
 #include <memstr.h>
 

kernel/test/mm/slab2.c

@@ -32 +32 @@
 #include <proc/thread.h>
 #include <arch.h>
-#include <panic.h>
 #include <mm/frame.h>
 #include <memstr.h>
@@ -89 +88 @@
                 data1 = slab_alloc(cache1, FRAME_ATOMIC);
                 if (!data1) {
-                        panic("Incorrect memory size - use another test.");
+                        printf("Incorrect memory size - use another test.");
+                        return;
                 }
                 memsetb((uintptr_t)data1, ITEM_SIZE, 0);