Changeset 96348adc in mainline for kernel/test/mm/falloc1.c

Timestamp:

2006-12-12T17:24:58Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

7e13972

Parents:

34db7fa

Message:

cleanup tests

File:

• kernel/test/mm/falloc1.c (modified) (5 diffs)

kernel/test/mm/falloc1.c

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 #include <print.h>
 #include <test.h>
@@ -36 +37 @@
 #include <align.h>
 
-#ifdef CONFIG_BENCH
-#include <arch/cycle.h>
-#endif
-
 #define MAX_FRAMES 1024
 #define MAX_ORDER 8
 #define TEST_RUNS 2
 
-void test_falloc1(void) {
-#ifdef CONFIG_BENCH
-        uint64_t t0 = get_cycle();
-#endif
-        uintptr_t * frames = (uintptr_t *) malloc(MAX_FRAMES*sizeof(uintptr_t), 0);
-        int results[MAX_ORDER+1];
+char * test_falloc1(void) {
+        uintptr_t * frames = (uintptr_t *) malloc(MAX_FRAMES * sizeof(uintptr_t), 0);
+        int results[MAX_ORDER + 1];
         
         int i, order, run;
@@ -55 +49 @@
 
         ASSERT(TEST_RUNS > 1);
-        ASSERT(frames != NULL)
+        if (frames == NULL)
+                return "Unable to allocate frames";
 
         for (run = 0; run < TEST_RUNS; run++) {
@@ -65 +60 @@
                                 
                                 if (ALIGN_UP(frames[allocated], FRAME_SIZE << order) != frames[allocated]) {
-                                        panic("Test failed. Block at address %p (size %dK) is not aligned\n", frames[allocated], (FRAME_SIZE << order) >> 10);
+                                        printf("Block at address %p (size %dK) is not aligned\n", frames[allocated], (FRAME_SIZE << order) >> 10);
+                                        return "Test failed";
                                 }
                                 
-                                if (frames[allocated]) {
+                                if (frames[allocated])
                                         allocated++;
-                                } else {
+                                else {
                                         printf("done. ");
                                         break;
                                 }
                         }
-                
+                        
                         printf("%d blocks allocated.\n", allocated);
                 
                         if (run) {
-                                if (results[order] != allocated) {
-                                        panic("Test failed. Frame leak possible.\n");
-                                }
+                                if (results[order] != allocated)
+                                        return "Possible frame leak";
                         } else
                                 results[order] = allocated;
                         
                         printf("Deallocating ... ");
-                        for (i = 0; i < allocated; i++) {
+                        for (i = 0; i < allocated; i++)
                                 frame_free(KA2PA(frames[i]));
-                        }
                         printf("done.\n");
                 }
@@ -95 +89 @@
         free(frames);
         
-        printf("Test passed.\n");
-#ifdef CONFIG_BENCH
-        uint64_t dt = get_cycle() - t0;
-        printf("Time: %.*d cycles\n", sizeof(dt) * 2, dt);
-#endif
+        return NULL;
 }
-