Define INIT_APPNAME at compile-time and let tests use it

Author: scopeInfinity

Makefile

@@ -1,3 +1,12 @@
+# Program to auto start when kernel is ready.
+# List of program can be found at build/usr/bin/
+# Some of them are
+#  sh.out
+#  ls.out
+#  tictactoe.out
+#  calc.out
+INIT_APPNAME ?= sh.out
+
 ROOT_DIR = .
 BUILD_DIR = build
 INCLUDE_DIR = include/fuzzy
@@ -42,23 +51,9 @@ kernel_core = $(BUILD_DIR)/kernel/core
 
 MINIMAL_DISK = $(BUILD_DIR)/minimal_disk
 
-
-# Program to auto start when kernel is ready.
-# 1 - Tic Tac Toe
-# 2 - Calculator
-# 3 - ls
-# 4 - cat
-# 5 - sh
-RUN_APP_ID = 1
-
 # Apps
 SRC_APP = $(SRC_DIR)/usr/local/src
 BUILD_APP = $(BUILD_DIR)/usr/local/bin
-app_calc = $(BUILD_APP)/calc.out
-app_tic_tac_toe = $(BUILD_APP)/tictactoe.out
-app_ls = $(BUILD_APP)/ls.out
-app_cat = $(BUILD_APP)/cat.out
-app_sh = $(BUILD_APP)/sh.out
 
 MEMORY_LOCATION_KERNEL = 0xC000
 

external/src/Makefile.mk

@@ -8,7 +8,9 @@ $(BUILD_DIR)/external/bin/mbr_builder: external/src/mbr_builder.c
 	mkdir -p $(dir $@)
 	$(HOST_CC) -o $@ $<
 
-$(BUILD_DIR)/external/out/fuzzy_mount: $(patsubst $(SRC_APP)/%.c,$(BUILD_APP)/%.out,$(shell find $(SRC_APP)/ -name '*.c'))
+$(BUILD_DIR)/external/out/fuzzy_mount: $(patsubst $(SRC_APP)/%.c,$(BUILD_APP)/%.out,$(shell find $(SRC_APP)/ -name '*.c')) \
+		README.md \
+		.gdbinit
     # not a mount
 	mkdir -p $@
 	cp -f -t $@ $^

src/kernel/Makefile.mk

@@ -7,6 +7,7 @@ debug_kernel: $(kernel_core)
 $(SELF_BUILD_DIR)/%.o: $(SELF_SRC_DIR)/%.c $(BUILD_USR_INCLUDE_ALL)
 	mkdir -p $(dir $@)
 	$(KERNEL_CC) -c -o $@ \
+		-D INIT_APPNAME=\"$(INIT_APPNAME)\" \
 		-D __SOURCE_SNAPSHOT__=$(SOURCE_SNAPSHOT) \
 		-D MEMORY_LOCATION_KERNEL=$(MEMORY_LOCATION_KERNEL) \
 		-D MEMORY_LOCATION_APP=$(MEMORY_LOCATION_APP) \

src/kernel/core.c

@@ -45,8 +45,8 @@ void kernel_core_entry() {
 
     process_scheduler_init();
 
-    int sh_pid = spawn("sh.out");
-    print_log("first user process created: %d", sh_pid);
+    int init_pid = spawn(INIT_APPNAME);
+    print_log("init process created: %d", init_pid);
     interrupt_pit_enable();
     while (1);
 }

tests/lib.sh

@@ -6,6 +6,7 @@ BUILD_TEST_DIR="build_test"
 MONITOR_PORT=55555
 QEMU_SCREENSHOT="/tmp/$(basename $0 .sh).ppm"
 QEMU_SCREENSHOT_ARTIFACT="${QEMU_SCREENSHOT%.ppm}.png"
+INIT_APPNAME="tictactoe.out"
 
 MAGIC_WORD_SLEEP="##SLEEP-10s##"
 
@@ -88,7 +89,8 @@ export -f inject_test_code_c
 ##########################################
 function sync_to_src_test() {
     # Prepare source code directory for tests.
-    rsync -r "${SRC_DIR:?}" "${SRC_TEST_DIR:?}"
+    rm -r "${SRC_TEST_DIR:?}"
+    cp -r "${SRC_DIR:?}" "${SRC_TEST_DIR:?}"
 
     find "${SRC_TEST_DIR:?}" -iname '*.asm' -exec bash -c 'inject_test_code_asm "$0" "$1"' {} "$1" \;
     find "${SRC_TEST_DIR:?}" -iname '*.c' -exec bash -c 'inject_test_code_c "$0" "$1"' {} "$1" \;
@@ -100,6 +102,7 @@ function sync_to_src_test() {
 #   COMMAND_OUTPUT
 #   SCREEN_CONTENT
 #   QEMU_PID
+#   INIT_APPNAME
 # Arguments:
 #   Magic Word
 #   Inject Keyword
@@ -115,7 +118,10 @@ function os_test_up() {
     sync_to_src_test "${test_inject_keyword:?}"
 
     # Turn up QEMU in background
-    make qemu \
+    make clean BUILD_DIR="${BUILD_TEST_DIR:?}" \
+        && make configure \
+        && make qemu \
+        INIT_APPNAME="${INIT_APPNAME:?}" \
         SRC_DIR="${SRC_TEST_DIR:?}" \
         BUILD_DIR="${BUILD_TEST_DIR:?}" \
         QEMU_SHUT_FLAGS="" \