[Test] Compare memory load from disk for BT Stage 1.

Author: scopeInfinity

src/bootloader/stage1.asm

@@ -31,7 +31,7 @@
         JMP label_exit
 
 label_bts2_loaded:
-        move_xy 06, 07, 00
+        print_string_ext bls2_loaded, bls2_loaded_len, 06, 07, C_WHITE, C_BLACK, 0
         print_hex_string_ext 0x8000, 10, C_WHITE, 0
         ; __TEST_INJECT_BT1__: mov eax, 0x9A11C824
         ; __TEST_INJECT_BT1__: HLT
@@ -47,7 +47,7 @@ label_exit:
     bl_welcome_len         equ       ($-bl_welcome)
     bls1                   db      "Bootloader: Stage 1"
     bls1_len               equ       ($-bls1)
-    bls2_loaded            db      "Stage 2 Loaded. Trying to launch..."
+    bls2_loaded            db      "Stage 2 Loaded: "
     bls2_loaded_len        equ       ($-bls2_loaded)
     bls2_load_fail         db      "Stage 2 Load Failed!"
     bls2_load_fail_len     equ       ($-bls2_load_fail)

tests/bootloader_stage1_test.sh

@@ -9,8 +9,13 @@ os_test_up "${TEST_MAGIC_WANT:?}" "${TEST_INJECT_WORD:?}" || exit -1
 
 # Test
 set -e
+set -x
+
 echo "${SCREEN_CONTENT:?}" | grep "Bootloader: Stage 1" || \
-	( echo "Test Failed!" && exit -1 )
+	err $LINENO "Test Failed! "
+
+echo "${SCREEN_CONTENT:?}" | grep "Stage 2 Loaded: `build_8hexbyte bootloader/stage2`" || \
+	err $LINENO "Test Failed! "
 
 wait ${QEMU_PID:?}
 echo "$0 passed!!!"

tests/lib.sh

@@ -7,6 +7,43 @@ MONITOR_PORT=55555
 QEMU_SCREENSHOT="/tmp/qemu.ppm"
 
 
+##########################################
+# Raise error.
+# Arguments:
+#   line number
+#   error message
+# Output:
+#   error to stderr
+##########################################
+function err() {
+    echo -e "\e[01;31m[`basename $0`:$1] error\e[0m: $2" >&1
+    exit -1
+}
+
+
+##########################################
+# Resolves filename from build target.
+# Arguments:
+#   build target
+# Output:
+#   filename
+##########################################
+function build_filename() {
+    echo "${BUILD_TEST_DIR:?}/${1}"
+}
+
+##########################################
+# Prints first 8 hex bytes of given file.
+# Arguments:
+#   build target
+# Output:
+#   first 8 byte
+##########################################
+function build_8hexbyte() {
+    xxd -p -g1 -l 8 -u "`build_filename $1`"
+}
+
+
 ##########################################
 # Activate Code for testing within source.
 # Arguments:

tests/run.sh

@@ -4,7 +4,6 @@ set -e
 # Execute Tests
 timeout 2m bash tests/bootloader_stage1_test.sh
 timeout 2m bash tests/bootloader_stage2_test.sh
-
 # TODO: Temporarily disabling following tests, until they are ready.
 # timeout 2m bash tests/kernel_core_entry_test.sh