feat: add test img

Yttehs-HDX · Dec 2, 2024 · 52deef8 · 52deef8
1 parent 0a562bb
commit 52deef8
Show file tree

Hide file tree

Showing 39 changed files with 20 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-.PHONY : all build clean setup
+.PHONY : all build test clean setup
 
 all:
 	@cd user && make -s all
@@ -8,6 +8,10 @@ build:
 	@cd user && make -s all
 	@cd kernel && make -s build
 
+test:
+	@cd user && make -s build
+	@cd kernel && make -s test
+
 clean:
 	@cd user && make -s clean
 	@cd kernel && make -s clean

diff --git a/kernel/Makefile b/kernel/Makefile
@@ -1,11 +1,12 @@
-.PHONY : all build run debug connect fmt clean
+.PHONY : all build run test debug connect fmt clean
 
 ARCH := riscv64gc-unknown-none-elf
 BUILD_TYPE := release
 BIOS := rustsbi.bin
 KERNEL := kernel
 TARGET := target/$(ARCH)/$(BUILD_TYPE)/$(KERNEL)
 FS_IMG := ../user/target/${ARCH}/${BUILD_TYPE}/sdcard.img
+TEST_IMG := ../test/test.img
 
 CARGO := cargo
 CARGO_FLAGS := --$(BUILD_TYPE)
@@ -18,6 +19,13 @@ QEMU_FLAGS := -machine virt \
 	-device virtio-blk-device,drive=x0,bus=virtio-mmio-bus.0 \
 	-nographic
 
+TEST_FLAGS := -machine virt \
+	-bios ../bootloader/$(BIOS) \
+	-kernel $(TARGET) \
+	-drive file=$(TEST_IMG),if=none,format=raw,id=x0 \
+	-device virtio-blk-device,drive=x0,bus=virtio-mmio-bus.0 \
+	-nographic
+
 GDB := riscv64-elf-gdb
 GDB_FLAGS := -ex "file $(TARGET)" \
 	-ex "target remote :1234" \
@@ -31,6 +39,9 @@ build:
 run: build
 	@$(QEMU) $(QEMU_FLAGS)
 
+test: build
+	@$(QEMU) $(TEST_FLAGS)
+
 debug:
 	@echo -e "\033[33m[+] Run 'make connect' in another terminal at the same dir\033[0m"
 	@$(QEMU) $(QEMU_FLAGS) -S -s

diff --git a/test/cases/brk b/test/cases/brk
diff --git a/test/cases/chdir b/test/cases/chdir
diff --git a/test/cases/clone b/test/cases/clone
diff --git a/test/cases/close b/test/cases/close
diff --git a/test/cases/dup b/test/cases/dup
diff --git a/test/cases/dup2 b/test/cases/dup2
diff --git a/test/cases/execve b/test/cases/execve
diff --git a/test/cases/exit b/test/cases/exit
diff --git a/test/cases/fork b/test/cases/fork
diff --git a/test/cases/fstat b/test/cases/fstat
diff --git a/test/cases/getcwd b/test/cases/getcwd
diff --git a/test/cases/getdents b/test/cases/getdents
diff --git a/test/cases/getpid b/test/cases/getpid
diff --git a/test/cases/getppid b/test/cases/getppid
diff --git a/test/cases/gettimeofday b/test/cases/gettimeofday
diff --git a/test/cases/mkdir_ b/test/cases/mkdir_
diff --git a/test/cases/mmap b/test/cases/mmap
diff --git a/test/cases/mnt/test_mount b/test/cases/mnt/test_mount
diff --git a/test/cases/mount b/test/cases/mount
diff --git a/test/cases/munmap b/test/cases/munmap
diff --git a/test/cases/open b/test/cases/open
diff --git a/test/cases/openat b/test/cases/openat
diff --git a/test/cases/pipe b/test/cases/pipe
diff --git a/test/cases/read b/test/cases/read
diff --git a/test/cases/sleep b/test/cases/sleep
diff --git a/test/cases/test_echo b/test/cases/test_echo
diff --git a/test/cases/text.txt b/test/cases/text.txt
@@ -0,0 +1,3 @@
+Hi, this is a text file.
+syscalls testing success!
+
diff --git a/test/cases/times b/test/cases/times
diff --git a/test/cases/umount b/test/cases/umount
diff --git a/test/cases/uname b/test/cases/uname
diff --git a/test/cases/unlink b/test/cases/unlink
diff --git a/test/cases/wait b/test/cases/wait
diff --git a/test/cases/waitpid b/test/cases/waitpid
diff --git a/test/cases/write b/test/cases/write
diff --git a/test/cases/yield b/test/cases/yield
diff --git a/test/raw/sdcard.img b/test/raw/sdcard.img
diff --git a/test/test.img b/test/test.img
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		Hi, this is a text file.
		syscalls testing success!