Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-26 10:53:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add SMP tests with a general test blocklist

Browse Source
This commit is contained in:
Zhang Junyang
2024-08-26 18:04:55 +08:00
committed by Tate, Hongliang Tian
parent 47be0a909b
commit d313674a2b
3 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/test_asterinas.yml vendored
View File

@ -78,10 +78,18 @@ jobs:
make run AUTO_TEST=syscall \ make run AUTO_TEST=syscall \
SYSCALL_TEST_DIR=/exfat EXTRA_BLOCKLISTS_DIRS=blocklists.exfat \ SYSCALL_TEST_DIR=/exfat EXTRA_BLOCKLISTS_DIRS=blocklists.exfat \
ENABLE_KVM=0 BOOT_PROTOCOL=multiboot2 RELEASE=1 ENABLE_KVM=0 BOOT_PROTOCOL=multiboot2 RELEASE=1
- name: SMP Syscall Test (Multiboot2)
id: smp_syscall_test_mb2
run: make run AUTO_TEST=syscall ENABLE_KVM=1 BOOT_PROTOCOL=multiboot2 RELEASE=1 SMP=4
- name: General Test (Linux EFI Handover Boot Protocol) - name: General Test (Linux EFI Handover Boot Protocol)
id: test_linux id: test_linux
run: make run AUTO_TEST=test ENABLE_KVM=1 BOOT_PROTOCOL=linux-efi-handover64 RELEASE=1 run: make run AUTO_TEST=test ENABLE_KVM=1 BOOT_PROTOCOL=linux-efi-handover64 RELEASE=1
- name: SMP General Test (Multiboot2)
id: smp_test_mb2
run: make run AUTO_TEST=test ENABLE_KVM=1 BOOT_PROTOCOL=multiboot2 RELEASE=1 SMP=4
integration-test-tdx: integration-test-tdx:
if: github.event_name == 'schedule' if: github.event_name == 'schedule'

3
Makefile
View File

@ -36,6 +36,9 @@ CARGO_OSDK_ARGS += --kcmd-args="SYSCALL_TEST_DIR=$(SYSCALL_TEST_DIR)"
CARGO_OSDK_ARGS += --kcmd-args="EXTRA_BLOCKLISTS_DIRS=$(EXTRA_BLOCKLISTS_DIRS)" CARGO_OSDK_ARGS += --kcmd-args="EXTRA_BLOCKLISTS_DIRS=$(EXTRA_BLOCKLISTS_DIRS)"
CARGO_OSDK_ARGS += --init-args="/opt/syscall_test/run_syscall_test.sh" CARGO_OSDK_ARGS += --init-args="/opt/syscall_test/run_syscall_test.sh"
else ifeq ($(AUTO_TEST), test) else ifeq ($(AUTO_TEST), test)
ifneq ($(SMP), 1)
CARGO_OSDK_ARGS += --kcmd-args="BLOCK_UNSUPPORTED_SMP_TESTS=1"
endif
CARGO_OSDK_ARGS += --init-args="/test/run_general_test.sh" CARGO_OSDK_ARGS += --init-args="/test/run_general_test.sh"
else ifeq ($(AUTO_TEST), boot) else ifeq ($(AUTO_TEST), boot)
CARGO_OSDK_ARGS += --init-args="/test/boot_hello.sh" CARGO_OSDK_ARGS += --init-args="/test/boot_hello.sh"

10
test/apps/scripts/run_general_test.sh
View File

@ -8,9 +8,13 @@ SCRIPT_DIR=/test
cd ${SCRIPT_DIR} cd ${SCRIPT_DIR}
./shell_cmd.sh ./shell_cmd.sh
./fs.sh
./process.sh
./network.sh
./test_epoll_pwait.sh ./test_epoll_pwait.sh
# TODO: Support the following tests with SMP
if [ -z $BLOCK_UNSUPPORTED_SMP_TESTS ]; then
./fs.sh # will hang
./process.sh # will randomly hang
./network.sh # will hang
fi
echo "All general tests passed." echo "All general tests passed."