Merge branch 'tests'

Author: scopeInfinity

src/bootloader/stage1.asm

@@ -33,8 +33,8 @@
 label_bts2_loaded:
         move_xy 06, 07, 00
         print_hex_string_ext 0x8000, 10, C_WHITE, 0
-        ; __TEST_INJECT__: mov eax, 0x9A11C824
-        ; __TEST_INJECT__: HLT
+        ; __TEST_INJECT_BT1__: mov eax, 0x9A11C824
+        ; __TEST_INJECT_BT1__: HLT
         JMP 0x8000
         JMP label_exit
 

src/bootloader/stage2.asm

@@ -40,6 +40,9 @@ global label_exit
         mov eax, cr0
         or eax, 0x00000001
         mov cr0, eax
+
+        ; __TEST_INJECT_BT2__: mov eax, 0x198A65C3
+        ; __TEST_INJECT_BT2__: HLT
         jmp 0x08:0x0000     ; address of smart kernel init
 
     label_exit:

tests/bootloader_stage1_test.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+TEST_INJECT_WORD="__TEST_INJECT_BT1__"
+TEST_MAGIC_WANT="9A11C824"
+
+source tests/lib.sh
+
+os_test_up "${TEST_INJECT_WORD:?}" || exit -1
+
+# Test
+set -e
+echo "${SCREEN_CONTENT:?}" | grep "Bootloader: Stage 1" || ( echo "Test Failed!" && exit -1 )
+wait ${QEMU_PID:?}
+echo "$0 passed!!!"

tests/bootloader_stage2_test.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+TEST_INJECT_WORD="__TEST_INJECT_BT2__"
+TEST_MAGIC_WANT="198A65C3"
+
+source tests/lib.sh
+
+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 )
+wait ${QEMU_PID:?}
+echo "$0 passed!!!"

tests/lib.sh

@@ -5,19 +5,51 @@ SRC_TEST_DIR="src_test/"
 MONITOR_PORT=55555
 QEMU_SCREENSHOT="/tmp/qemu.ppm"
 
+
+##########################################
+# Activate Code for testing within source.
+# Arguments:
+#   Filename
+#   Inject Keyword
+##########################################
+function inject_test_code() {
+    echo "Injecting Test Code in $1 (if any)"
+    sed -i "s/;\s*${2}:\s*//g" "$1"
+}
+export -f inject_test_code
+
+
+##########################################
+# Copy SRC to Test Sorce and Inject Code.
+# Arguments:
+#   Inject Keyword
+##########################################
+function sync_to_src_test() {
+    echo "HEREEEEEE!"
+    # Prepare source code directory for tests.
+    rsync -r "${SRC_DIR:?}" "${SRC_TEST_DIR:?}"
+
+    find "${SRC_TEST_DIR:?}" -iname '*.asm' -exec bash -c 'inject_test_code "$0" "$1"' {} "$1" \;
+}
+
+
 ###################################################
 # Turn up OS in QEMU and wait for $TEST_MAGIC_WANT.
 # Globals:
 #   TEST_MAGIC_WANT
 #   COMMAND_OUTPUT
 #   SCREEN_CONTENT
 #   QEMU_PID
+# Arguments:
+#   Inject Keyword
 # Outputs:
 #   Logs
 # Returns:
 #   0 on success, non-zero on error.
 ###################################################
-function os_up() {
+function os_test_up() {
+    sync_to_src_test "$1"
+
     # Turn up QEMU in background
     make qemu SRC_DIR="${SRC_TEST_DIR:?}" \
               QEMU_SHUT_FLAGS="" \
@@ -44,6 +76,7 @@ function os_up() {
             echo "Magic Word Found! Continuing the test..." && \
             break
         echo "Magic word not found! Got: $COMMAND_OUTPUT"
+        sleep 1s
     done
 
     if [ ! -f ${QEMU_SCREENSHOT:?} ]; then

tests/run.sh

@@ -1,11 +1,9 @@
 #!/bin/bash
 set -e
 
-# Preprocess
-bash tests/preprocess.sh
-
 # Execute Tests
-bash tests/stage1_test.sh
+bash tests/bootloader_stage1_test.sh
+bash tests/bootloader_stage2_test.sh
 
 # Done
 echo "All tests passed!"