Minor changes to display.

1 files changed, 6 insertions, 8 deletions

diff --git a/src/kernel/core/test.c b/src/kernel/core/test.c
index 77c7029..fa26c7b 100644
--- a/src/kernel/core/test.c
+++ b/src/kernel/core/test.c
@@ -3,16 +3,14 @@
 #include <mem/mem.h>
 #include "sys.h"
 
-#define TEST_KMALLOC(var, sz) monitor_write("kmalloc:"); monitor_writeHex(sz); void *var = kmalloc(sz); \
-	if (var < 0xE0000000) { monitor_write(":FAIL\t"); PANIC("A test failed."); } \
-	else monitor_write(":OK:"); monitor_writeHex(var); monitor_write("\t");
-#define TEST_KFREE(var) if (var != 0) { monitor_write("kfree:"); monitor_writeHex(var); kfree(var); monitor_write(":OK\t"); }
+#define TEST_KMALLOC(var, sz) void *var = kmalloc(sz); ASSERT(var > 0xE0000000);
+#define TEST_KFREE(var) if (var != 0) { kfree(var); }
 
 void test_run() {
-	monitor_write("Run kmalloc() and kfree() unit tests:\n");
+	monitor_write("Unit tests:\n\tkmalloc:");
 	int i;
-	for (i = 1; i <= 5; i++) {
-		monitor_write("\nMALLOC TEST SERIES #"); monitor_writeDec(i); monitor_write(":\n");
+	for (i = 1; i <= 7; i++) {
+		monitor_write(" #"); monitor_writeDec(i);
 		TEST_KMALLOC(a, 32);
 		TEST_KMALLOC(b, 64);
 		TEST_KMALLOC(c, 256);
@@ -27,5 +25,5 @@ void test_run() {
 		TEST_KFREE(f);
 		TEST_KFREE(g);
 	}
-	monitor_write("\nUnit tests finished.\n");
+	monitor_write("\n >> Tests OK\n");
 }