[Tests] Added build_test/ to separate test build artifacts

Author: scopeInfinity

.gitignore

@@ -2,4 +2,5 @@
 *.o
 local_notes/
 build/
-src_test/
+src_test/
+build_test/

Makefile

@@ -14,15 +14,15 @@ SRC_MEMMGR = $(SRC_DIR)/memmgr
 SRC_APP = $(SRC_DIR)/app
 SRC_REALMODE = $(SRC_DIR)/real_mode
 
-BUILD_BOOTLOADER = build/bootloader
-BUILD_KERNEL = build/kernel
-BUILD_DRIVERS = build/drivers
-BUILD_LIB_DS = build/lib/ds
-BUILD_LIB_SYSCALL = build/lib/syscall
-BUILD_LIB_UTILS = build/lib/utils
-BUILD_LIB = build/lib
-BUILD_APP = build/app
-BUILD_REALMODE = build/real_mode
+BUILD_BOOTLOADER = $(BUILD_DIR)/bootloader
+BUILD_KERNEL = $(BUILD_DIR)/kernel
+BUILD_DRIVERS = $(BUILD_DIR)/drivers
+BUILD_LIB_DS = $(BUILD_DIR)/lib/ds
+BUILD_LIB_SYSCALL = $(BUILD_DIR)/lib/syscall
+BUILD_LIB_UTILS = $(BUILD_DIR)/lib/utils
+BUILD_LIB = $(BUILD_DIR)/lib
+BUILD_APP = $(BUILD_DIR)/app
+BUILD_REALMODE = $(BUILD_DIR)/real_mode
 .PHONY: all clean
 
 # Files

tests/bootloader_stage1_test.sh

@@ -9,6 +9,8 @@ os_test_up "${TEST_INJECT_WORD:?}" || exit -1
 
 # Test
 set -e
-echo "${SCREEN_CONTENT:?}" | grep "Bootloader: Stage 1" || ( echo "Test Failed!" && exit -1 )
+echo "${SCREEN_CONTENT:?}" | grep "Bootloader: Stage 1" || \
+	( echo "Test Failed!" && exit -1 )
+
 wait ${QEMU_PID:?}
 echo "$0 passed!!!"

tests/bootloader_stage2_test.sh

@@ -9,7 +9,10 @@ os_test_up "${TEST_INJECT_WORD:?}" || exit -1
 
 # Test
 set -e
-echo "${SCREEN_CONTENT:?}" | grep "Bootloader: Stage 2" || ( echo "Test Failed!" && exit -1 )
-echo "${SCREEN_CONTENT:?}" | grep "Loading GDT Table and entering protected mode" || ( echo "Test Failed!" && exit -1 )
+echo "${SCREEN_CONTENT:?}" | grep "Bootloader: Stage 2" || \
+    ( echo "Test Failed!" && exit -1 )
+echo "${SCREEN_CONTENT:?}" | grep "Loading GDT Table and entering protected mode" || \
+    ( echo "Test Failed!" && exit -1 )
+
 wait ${QEMU_PID:?}
 echo "$0 passed!!!"

tests/kernel_core_entry_test.sh

@@ -9,7 +9,10 @@ os_test_up "${TEST_INJECT_WORD:?}" || exit -1
 
 # Test
 set -e
-echo "${SCREEN_CONTENT:?}" | grep "Initializing Kernel" || ( echo "Test Failed!" && exit -1 )
-echo "${SCREEN_CONTENT:?}" | grep "Loading IDT Table" || ( echo "Test Failed!" && exit -1 )
+echo "${SCREEN_CONTENT:?}" | grep "Initializing Kernel" || \
+    ( echo "Test Failed!" && exit -1 )
+echo "${SCREEN_CONTENT:?}" | grep "Loading IDT Table" || \
+    ( echo "Test Failed!" && exit -1 )
+
 wait ${QEMU_PID:?}
 echo "$0 passed!!!"

tests/lib.sh

@@ -2,6 +2,7 @@
 
 SRC_DIR="src/"
 SRC_TEST_DIR="src_test/"
+BUILD_TEST_DIR="build_test/"
 MONITOR_PORT=55555
 QEMU_SCREENSHOT="/tmp/qemu.ppm"
 
@@ -50,9 +51,11 @@ function os_test_up() {
     sync_to_src_test "$1"
 
     # Turn up QEMU in background
-    make qemu SRC_DIR="${SRC_TEST_DIR:?}" \
-              QEMU_SHUT_FLAGS="" \
-            QEMU_EXTRA_FLAGS="-nographic -monitor telnet:127.0.0.1:${MONITOR_PORT:?},server,nowait" &
+    make qemu \
+        SRC_DIR="${SRC_TEST_DIR:?}" \
+        BUILD_DIR="${BUILD_TEST_DIR:?}" \
+        QEMU_SHUT_FLAGS="" \
+        QEMU_EXTRA_FLAGS="-nographic -monitor telnet:127.0.0.1:${MONITOR_PORT:?},server,nowait" &
     QEMU_PID=$!
 
     while ! nc -z localhost ${MONITOR_PORT:?}; do