Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-08 12:56:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename SYSCALL_TEST_DIR to SYSCALL_TEST_WORKDIR for clarity

Browse Source
This commit is contained in:
Qingsong Chen 2025-05-20 07:55:59 +00:00 committed by Tate, Hongliang Tian
parent 418fbcd405
commit a0af7ae680
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/actions/test/action.yml vendored
View File

@ -36,8 +36,8 @@ inputs:
extra_blocklists: extra_blocklists:
description: 'Extra blocklists directories' description: 'Extra blocklists directories'
required: false required: false
syscall_test_dir: syscall_test_workdir:
description: 'Syscall test directory' description: 'Syscall test working directory'
required: false required: false
boot_protocol: boot_protocol:
description: 'Boot protocol (linux-efi-handover64/multiboot/multiboot2/linux-legacy32)' description: 'Boot protocol (linux-efi-handover64/multiboot/multiboot2/linux-legacy32)'
@ -85,7 +85,7 @@ runs:
[[ -n "${{ inputs.scheme }}" ]] && CMD+=" SCHEME=${{ inputs.scheme }}" [[ -n "${{ inputs.scheme }}" ]] && CMD+=" SCHEME=${{ inputs.scheme }}"
[[ -n "${{ inputs.arch }}" ]] && CMD+=" ARCH=${{ inputs.arch }}" [[ -n "${{ inputs.arch }}" ]] && CMD+=" ARCH=${{ inputs.arch }}"
[[ -n "${{ inputs.extra_blocklists }}" ]] && CMD+=" EXTRA_BLOCKLISTS_DIRS=${{ inputs.extra_blocklists }}" [[ -n "${{ inputs.extra_blocklists }}" ]] && CMD+=" EXTRA_BLOCKLISTS_DIRS=${{ inputs.extra_blocklists }}"
[[ -n "${{ inputs.syscall_test_dir }}" ]] && CMD+=" SYSCALL_TEST_DIR=${{ inputs.syscall_test_dir }}" [[ -n "${{ inputs.syscall_test_workdir }}" ]] && CMD+=" SYSCALL_TEST_WORKDIR=${{ inputs.syscall_test_workdir }}"
[[ -n "${{ inputs.boot_protocol }}" ]] && CMD+=" BOOT_PROTOCOL=${{ inputs.boot_protocol }}" [[ -n "${{ inputs.boot_protocol }}" ]] && CMD+=" BOOT_PROTOCOL=${{ inputs.boot_protocol }}"
echo "Executing: $CMD" echo "Executing: $CMD"

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

@ -49,18 +49,18 @@ jobs:
# Syscall Test at Ext2 (MicroVM) # Syscall Test at Ext2 (MicroVM)
- test_id: 'syscall-ext2-microvm' - test_id: 'syscall-ext2-microvm'
scheme: 'microvm' scheme: 'microvm'
syscall_test_dir: '/ext2' syscall_test_workdir: '/ext2'
# Syscall Test at Ext2 (IOMMU) (Debug Build) # Syscall Test at Ext2 (IOMMU) (Debug Build)
- test_id: 'syscall-ext2-iommu-debug' - test_id: 'syscall-ext2-iommu-debug'
scheme: 'iommu' scheme: 'iommu'
syscall_test_dir: '/ext2' syscall_test_workdir: '/ext2'
release: false release: false
# Syscall Test at Exfat (Multiboot2) (without KVM enabled) # Syscall Test at Exfat (Multiboot2) (without KVM enabled)
- test_id: 'syscall-exfat-multiboot2-nokvm' - test_id: 'syscall-exfat-multiboot2-nokvm'
boot_protocol: 'multiboot2' boot_protocol: 'multiboot2'
enable_kvm: false enable_kvm: false
extra_blocklists: 'blocklists.exfat' extra_blocklists: 'blocklists.exfat'
syscall_test_dir: '/exfat' syscall_test_workdir: '/exfat'
# SMP Syscall Test (Multiboot2) # SMP Syscall Test (Multiboot2)
- test_id: 'syscall-multiboot2-smp4' - test_id: 'syscall-multiboot2-smp4'
boot_protocol: 'multiboot2' boot_protocol: 'multiboot2'
@ -87,7 +87,7 @@ jobs:
netdev: ${{ matrix.netdev || 'tap' }} netdev: ${{ matrix.netdev || 'tap' }}
scheme: ${{ matrix.scheme }} scheme: ${{ matrix.scheme }}
extra_blocklists: ${{ matrix.extra_blocklists }} extra_blocklists: ${{ matrix.extra_blocklists }}
syscall_test_dir: ${{ matrix.syscall_test_dir }} syscall_test_workdir: ${{ matrix.syscall_test_workdir }}
boot_protocol: ${{ matrix.boot_protocol || 'linux-efi-handover64' }} boot_protocol: ${{ matrix.boot_protocol || 'linux-efi-handover64' }}
osdk-test: osdk-test:

4
.github/workflows/test_x86_tdx.yml vendored
View File

@ -27,7 +27,7 @@ jobs:
# Syscall Test at Exfat # Syscall Test at Exfat
- test_id: 'syscall-exfat' - test_id: 'syscall-exfat'
extra_blocklists: 'blocklists.exfat' extra_blocklists: 'blocklists.exfat'
syscall_test_dir: '/exfat' syscall_test_workdir: '/exfat'
# SMP Syscall Test # SMP Syscall Test
- test_id: 'syscall-smp4' - test_id: 'syscall-smp4'
netdev: 'tap' netdev: 'tap'
@ -52,7 +52,7 @@ jobs:
smp: ${{ matrix.smp }} smp: ${{ matrix.smp }}
netdev: ${{ matrix.netdev }} netdev: ${{ matrix.netdev }}
extra_blocklists: ${{ matrix.extra_blocklists }} extra_blocklists: ${{ matrix.extra_blocklists }}
syscall_test_dir: ${{ matrix.syscall_test_dir }} syscall_test_workdir: ${{ matrix.syscall_test_workdir }}
osdk-test: osdk-test:
runs-on: self-hosted runs-on: self-hosted

4
Makefile
View File

@ -34,7 +34,7 @@ GDB_PROFILE_INTERVAL ?= 0.1
# Here are the options for the auto test feature. # Here are the options for the auto test feature.
AUTO_TEST ?= none AUTO_TEST ?= none
EXTRA_BLOCKLISTS_DIRS ?= "" EXTRA_BLOCKLISTS_DIRS ?= ""
SYSCALL_TEST_DIR ?= /tmp SYSCALL_TEST_WORKDIR ?= /tmp
# End of auto test features. # End of auto test features.
# Network settings # Network settings
@ -53,7 +53,7 @@ CARGO_OSDK_ARGS := --target-arch=$(ARCH) --kcmd-args="ostd.log_level=$(LOG_LEVEL
ifeq ($(AUTO_TEST), syscall) ifeq ($(AUTO_TEST), syscall)
BUILD_SYSCALL_TEST := 1 BUILD_SYSCALL_TEST := 1
CARGO_OSDK_ARGS += --kcmd-args="SYSCALL_TEST_DIR=$(SYSCALL_TEST_DIR)" CARGO_OSDK_ARGS += --kcmd-args="SYSCALL_TEST_WORKDIR=$(SYSCALL_TEST_WORKDIR)"
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)

2
test/syscall_test/run_syscall_test.sh
View File

@ -3,7 +3,7 @@
# SPDX-License-Identifier: MPL-2.0 # SPDX-License-Identifier: MPL-2.0
SCRIPT_DIR=$(dirname "$0") SCRIPT_DIR=$(dirname "$0")
TEST_TMP_DIR=${SYSCALL_TEST_DIR:-/tmp} TEST_TMP_DIR=${SYSCALL_TEST_WORKDIR:-/tmp}
TEST_BIN_DIR=$SCRIPT_DIR/tests TEST_BIN_DIR=$SCRIPT_DIR/tests
BLOCKLIST_DIR=$SCRIPT_DIR/blocklists BLOCKLIST_DIR=$SCRIPT_DIR/blocklists
FAIL_CASES=$SCRIPT_DIR/fail_cases FAIL_CASES=$SCRIPT_DIR/fail_cases