Moved test to app

11 files changed, 168 insertions, 175 deletions

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f608fdd..b27e78a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,7 +11,7 @@ jobs:
         with:
           submodules: true
       - name: Install
-        run: sudo apt-get update && sudo apt-get install -y build-essential bison flex libgmp3-dev libmpc-dev libmpfr-dev texinfo libcloog-isl-dev libisl-0.18-dev ccache curl nasm grub-common qemu qemu-kvm mtools cmake
+        run: sudo apt-get update && sudo apt-get install -y build-essential bison flex libgmp3-dev libmpc-dev libmpfr-dev texinfo libcloog-isl-dev libisl-0.18-dev ccache curl nasm grub-common qemu qemu-kvm mtools ctags
       - name: Get cross compiler
         id: cache-cross
         uses: actions/cache@v1
diff --git a/Makefile b/Makefile
index 2b61e6c..28b6366 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,6 @@
 # MIT License, Copyright (c) 2020 Marvin Borner
 
 all: compile clean
-test: compile_test clean
 
 compile:
 	@$(MAKE) clean --no-print-directory -C libc/
@@ -17,19 +16,5 @@ compile:
 	@$(MAKE) --no-print-directory -C apps/
 	@echo "Compiled apps"
 
-compile_test:
-	@$(MAKE) clean --no-print-directory -C libc/
-	@$(MAKE) libc --no-print-directory -C libc/
-	@echo "Compiled libc"
-	@$(MAKE) clean --no-print-directory -C libc/
-	@$(MAKE) libk --no-print-directory -C libc/
-	@echo "Compiled libk"
-	@$(MAKE) --no-print-directory -C libgui/
-	@echo "Compiled libgui"
-	@$(MAKE) test --no-print-directory -C kernel/
-	@echo "Compiled kernel"
-	@$(MAKE) --no-print-directory -C apps/
-	@echo "Compiled apps"
-
 clean:
 	@find kernel/ apps/ libc/ \( -name "*.o" -or -name "*.a" -or -name "*.elf" -or -name "*.bin" \) -type f -delete
diff --git a/apps/Makefile b/apps/Makefile
index 4c26468..6a22e35 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -1,6 +1,6 @@
 # MIT License, Copyright (c) 2020 Marvin Borner
 
-COBJS = init.o wm.o test.o
+COBJS = init.o wm.o window.o test.o
 CC = ../cross/opt/bin/i686-elf-gcc
 LD = ../cross/opt/bin/i686-elf-ld
 OC = ../cross/opt/bin/i686-elf-objcopy
diff --git a/apps/init.c b/apps/init.c
index 05d1a3c..072e24e 100644
--- a/apps/init.c
+++ b/apps/init.c
@@ -9,8 +9,9 @@ int main(int argc, char **argv)
 	printf("ARGC: %d\n", argc);
 	printf("[%s loaded]\n", argv[0]);
 
+	// TODO: Fix GPF if file doesn't exist
 	int wm = exec("/wm", "wm", argv[1], NULL);
-	int test = exec("/test", "test", NULL);
+	int test = exec("/window", "test", NULL);
 
 	return wm + test;
 }
diff --git a/apps/test.c b/apps/test.c
index 3077c04..59847cc 100644
--- a/apps/test.c
+++ b/apps/test.c
@@ -1,58 +1,101 @@
 // MIT License, Copyright (c) 2020 Marvin Borner
 
 #include <conv.h>
-#include <def.h>
-#include <gui.h>
-#include <input.h>
+#include <cpu.h>
+#include <math.h>
+#include <mem.h>
 #include <print.h>
+#include <serial.h>
 #include <str.h>
+#include <sys.h>
+
+#define a_mag 0x55
+#define b_mag 0x42
+
+#define check(exp) pass_or_fail(__FILE__, __LINE__, __func__, #exp, "1", exp);
+#define equals(first, second)                                                                      \
+	pass_or_fail(__FILE__, __LINE__, __func__, #first, #second, (first) == (second));
+#define equals_str(first, second)                                                                  \
+	pass_or_fail(__FILE__, __LINE__, __func__, #first, #second, strcmp((first), (second)) == 0);
+
+static u32 failed;
+
+void pass_or_fail(const char *file_name, int line_num, const char *func, const char *first,
+		  const char *second, int success)
+{
+	failed += success ? 0 : 1;
+	printf("\x1B[%s\x1B[0m %s:%d: %s: %s == %s\n", success ? "32m[PASS]" : "31m[FAIL]",
+	       file_name, line_num, func, first, second);
+}
+
+void test_malloc()
+{
+	u32 *a = malloc(a_mag);
+	u32 *b = malloc(b_mag);
+	equals(a[-1], a_mag);
+	equals(a[a_mag], b_mag);
+	equals(b[-1], b_mag);
+}
+
+void test_math()
+{
+	equals(pow(2, 3), 8);
+	equals(pow(0, 3), 0);
+	equals(pow(0, 0), 1);
+}
+
+void test_conv()
+{
+	char buf1[1] = { 0 };
+	char buf2[7] = { 0 };
+	char buf3[5] = { 0 };
+	char buf4[3] = { 0 };
+	equals(atoi("42"), 42);
+	equals_str(htoa(0x42), "42");
+	equals(htoi("42"), 0x42);
+	equals_str(itoa(42), "42");
+	equals_str(conv_base(42, buf1, 0, 0), "");
+	equals_str(conv_base(42, buf2, 2, 0), "101010");
+	equals_str(conv_base(424242, buf3, 36, 0), "93ci");
+	equals_str(conv_base(0xffffffff, buf4, 10, 1), "-1");
+}
+
+void test_mem()
+{
+	char *str0 = "";
+	char *str1 = "";
+	char *str2 = "12345";
+	char *str3 = "12345";
+	char *str4 = "12354";
+	equals(memcmp(str4, str2, strlen(str2)), 1);
+	equals(memcmp(str2, str4, strlen(str2)), -1);
+	equals(memcmp(str2, str3, strlen(str2)), 0);
+	equals(memcmp(str0, str1, strlen(str0)), 0);
+	equals(memcmp(NULL, NULL, 0), 0);
+
+	char buf[6];
+	equals_str(memcpy(buf, "hallo", 6), "hallo");
+
+	char buf2[6];
+	equals_str(memset(buf2, 'x', 5), "xxxxx");
+}
 
 int main()
 {
-	print("[test loaded]\n");
-
-	struct window *win = gui_new_window(0);
-
-	gui_fill(win, BG_COLOR);
-	gui_border(win, FG_COLOR, 2);
-
-	gui_init("/font/spleen-12x24.psfu");
-	char *hello = "Hello, world!";
-	gui_write(win, win->width / 2 - (strlen(hello) * 12) / 2, 5, FG_COLOR, hello);
-	event_register(EVENT_KEYBOARD);
-
-	struct message *msg;
-	int char_x = 0;
-	int char_y = 1;
-	while (1) {
-		if (!(msg = msg_receive())) {
-			yield();
-			continue;
-		}
-		switch (msg->type) {
-		case EVENT_KEYBOARD: {
-			struct event_keyboard *event = msg->data;
-
-			if (event->magic != KEYBOARD_MAGIC)
-				break;
-
-			if (!event->press)
-				break;
-
-			int key = event->scancode;
-			if (key == KEY_ENTER) {
-				char_x = 0;
-				char_y++;
-			} else if (KEY_ALPHABETIC(key)) {
-				gui_write_char(win, 12 * char_x++, 24 * char_y + 5, FG_COLOR, 'a');
-			}
-
-			break;
-		}
-		default:
-			break;
-		}
-		yield();
-	}
+	// Serial connection
+	serial_install();
+	serial_print("\nConnected testing.\n");
+
+	test_malloc();
+	test_math();
+	test_conv();
+	test_mem();
+
+	if (failed)
+		printf("%d tests failed\n", failed);
+	else
+		print("All tests passed\n");
+
+	loop();
 	return 0;
 }
diff --git a/apps/window.c b/apps/window.c
new file mode 100644
index 0000000..eabac97
--- /dev/null
+++ b/apps/window.c
@@ -0,0 +1,58 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+
+#include <conv.h>
+#include <def.h>
+#include <gui.h>
+#include <input.h>
+#include <print.h>
+#include <str.h>
+
+int main()
+{
+	print("[test window loaded]\n");
+
+	struct window *win = gui_new_window(0);
+
+	gui_fill(win, BG_COLOR);
+	gui_border(win, FG_COLOR, 2);
+
+	gui_init("/font/spleen-12x24.psfu");
+	char *hello = "Hello, world!";
+	gui_write(win, win->width / 2 - (strlen(hello) * 12) / 2, 5, FG_COLOR, hello);
+	event_register(EVENT_KEYBOARD);
+
+	struct message *msg;
+	int char_x = 0;
+	int char_y = 1;
+	while (1) {
+		if (!(msg = msg_receive())) {
+			yield();
+			continue;
+		}
+		switch (msg->type) {
+		case EVENT_KEYBOARD: {
+			struct event_keyboard *event = msg->data;
+
+			if (event->magic != KEYBOARD_MAGIC)
+				break;
+
+			if (!event->press)
+				break;
+
+			int key = event->scancode;
+			if (key == KEY_ENTER) {
+				char_x = 0;
+				char_y++;
+			} else if (KEY_ALPHABETIC(key)) {
+				gui_write_char(win, 12 * char_x++, 24 * char_y + 5, FG_COLOR, 'a');
+			}
+
+			break;
+		}
+		default:
+			break;
+		}
+		yield();
+	}
+	return 0;
+}
diff --git a/kernel/Makefile b/kernel/Makefile
index a907986..07f985a 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -1,6 +1,7 @@
 # MIT License, Copyright (c) 2020 Marvin Borner
 
-COBJS = drivers/interrupts.o \
+COBJS = main.o \
+	drivers/interrupts.o \
 	drivers/interrupts_asm.o \
 	drivers/keyboard.o \
 	drivers/mouse.o \
@@ -25,7 +26,6 @@ CFLAGS = $(CSFLAGS) -Wall -Wextra -nostdlib -nostdinc -ffreestanding -fno-builti
 ASFLAGS = -f elf32
 
 all: compile bootloader
-test: compile_test bootloader
 
 %.o: %.c
 	@$(CC) -c $(CFLAGS) $< -o $@
@@ -37,15 +37,7 @@ bootloader:
 	@mkdir -p ../build/
 	@$(AS) -f bin entry.asm -o ../build/boot.bin
 
-compile: main.o $(COBJS)
+compile: $(COBJS)
 	@mkdir -p ../build/
 	@$(LD) -N -ekernel_main -Ttext 0x00050000 -o ../build/kernel.bin -L../build/ $+ -lk --oformat binary
 	@$(CC) $(CFLAGS) -o ../build/debug.o -L../build/ $+ -lk
-
-compile_test: CFLAGS += -Dtest -Wl,-etest_all
-compile_test: test.o $(COBJS)
-	@mkdir -p ../build/
-	@$(LD) -N -etest_all -Ttext 0x00050000 -o ../build/kernel.bin -L../build/ $+ -lk --oformat binary
-	@$(CC) $(CFLAGS) -o ../build/debug.o -L../build/ $+ -lk
-
-.PHONY: test compile_test
diff --git a/kernel/features/load.c b/kernel/features/load.c
index d5dd839..2cbe2e7 100644
--- a/kernel/features/load.c
+++ b/kernel/features/load.c
@@ -12,8 +12,6 @@
 int bin_load(char *path, struct proc *proc)
 {
 	char *data = read_file(path);
-	if (!data)
-		return 1;
 
 	u32 stack = (u32)malloc(0x2000) + 0x1000;
 
@@ -21,7 +19,8 @@ int bin_load(char *path, struct proc *proc)
 	proc->regs.useresp = (u32)stack;
 	proc->regs.eip = (u32)data;
 	strcpy(proc->name, path + 1);
-	return 0;
+
+	return data ? 0 : 1;
 }
 
 int elf_verify(struct elf_header *h)
diff --git a/kernel/features/syscall.c b/kernel/features/syscall.c
index 5915d9d..25770a4 100644
--- a/kernel/features/syscall.c
+++ b/kernel/features/syscall.c
@@ -18,7 +18,7 @@ void syscall_handler(struct regs *r)
 	r->eax = 0;
 
 	if (num != SYS_RECEIVE && num != SYS_YIELD && num != SYS_TIME)
-		printf("[SYSCALL] %d: ", num);
+		printf("[SYSCALL] %d from %s: ", num, proc_current()->name);
 
 	switch (num) {
 	case SYS_LOOP: {
diff --git a/kernel/test.c b/kernel/test.c
deleted file mode 100644
index 1960a5a..0000000
--- a/kernel/test.c
+++ /dev/null
@@ -1,88 +0,0 @@
-// MIT License, Copyright (c) 2020 Marvin Borner
-
-#include <boot.h>
-#include <conv.h>
-#include <cpu.h>
-#include <math.h>
-#include <mem.h>
-#include <serial.h>
-#include <str.h>
-#include <test.h>
-
-void pass_or_fail(const char *file_name, int line_num, const char *func, const char *first,
-		  const char *second, int success)
-{
-	printf("\x1B[%s\x1B[0m %s:%d: %s: %s == %s\n", success ? "32m[PASS]" : "31m[FAIL]",
-	       file_name, line_num, func, first, second);
-}
-
-void test_malloc()
-{
-	heap_init(0x00f00000);
-	u32 *a = malloc(a_mag);
-	u32 *b = malloc(b_mag);
-	equals(a[-1], a_mag);
-	equals(a[a_mag], b_mag);
-	equals(b[-1], b_mag);
-}
-
-void test_math()
-{
-	equals(pow(2, 3), 8);
-	equals(pow(0, 3), 0);
-	equals(pow(0, 0), 1);
-}
-
-void test_conv()
-{
-	char buf1[1] = { 0 };
-	char buf2[7] = { 0 };
-	char buf3[5] = { 0 };
-	char buf4[3] = { 0 };
-	equals(atoi("42"), 42);
-	equals_str(htoa(0x42), "42");
-	equals(htoi("42"), 0x42);
-	equals_str(itoa(42), "42");
-	equals_str(conv_base(42, buf1, 0, 0), "");
-	equals_str(conv_base(42, buf2, 2, 0), "101010");
-	equals_str(conv_base(424242, buf3, 36, 0), "93ci");
-	equals_str(conv_base(0xffffffff, buf4, 10, 1), "-1");
-}
-
-void test_mem()
-{
-	char *str0 = "";
-	char *str1 = "";
-	char *str2 = "12345";
-	char *str3 = "12345";
-	char *str4 = "12354";
-	equals(memcmp(str4, str2, strlen(str2)), 1);
-	equals(memcmp(str2, str4, strlen(str2)), -1);
-	equals(memcmp(str2, str3, strlen(str2)), 0);
-	equals(memcmp(str0, str1, strlen(str0)), 0);
-	equals(memcmp(NULL, NULL, 0), 0);
-
-	char buf[6];
-	equals_str(memcpy(buf, "hallo", 5), "hallo");
-
-	char buf2[6];
-	equals_str(memset(buf2, 'x', 5), "xxxxx");
-}
-
-// TODO: Move to other file (top!)
-void test_all(struct vid_info *vid_info)
-{
-	// Serial connection
-	serial_install();
-	serial_print("\nConnected testing.\n");
-
-	// Boot passed
-	check(vid_info && vid_info->mode && vid_info->vbe);
-
-	test_malloc();
-	test_math();
-	test_conv();
-	test_mem();
-
-	idle();
-}
diff --git a/run b/run
index c302fa9..ecf06ad 100755
--- a/run
+++ b/run
@@ -89,11 +89,7 @@ make_build() {
     rm -rf build/*
 
     printf "\nBuilding...\n"
-    if [ "$mode" = "test" ]; then
-        make test
-    else
-        make
-    fi
+    make
 
     # Create disk image
     dd if=/dev/zero of=build/disk.img bs=1k count=32k status=none
@@ -103,6 +99,11 @@ make_build() {
     ./ext2util/ext2util -x build/disk.img -wf kernel.bin -i 5 >/dev/null
     rm kernel.bin
 
+    # Set test app as init
+    if [ "$mode" = "test" ]; then
+        cp build/apps/test build/apps/init
+    fi
+
     mkdir -p mnt/
     sudo mount build/disk.img mnt/
     sudo cp -r disk/* mnt/
@@ -115,9 +116,11 @@ make_build() {
 
 make_test() {
     if [ "$mode" = "test" ]; then
-        qemu_with_flags -nographic -drive file=build/disk.img,format=raw,index=1,media=disk &
+        qemu_with_flags -serial file:test.log -nographic -drive file=build/disk.img,format=raw,index=1,media=disk &
         sleep 2
         killall -9 qemu-system-i386
+        grep -E 'PASS|FAIL' test.log
+        exit $(grep -q "All tests passed" test.log)
     else
         qemu_with_flags -serial stdio -drive file=build/disk.img,format=raw,index=1,media=disk
     fi