From 246fbafa201700aac388ddd4bc591cd9424b6106 Mon Sep 17 00:00:00 2001 From: Tao Su Date: Thu, 11 Dec 2025 06:09:45 +0000 Subject: [PATCH] Export all SCML file paths via environment variable in Docker image --- tools/docker/Dockerfile | 4 ++++ tools/sctrace.sh | 5 +---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 4bdfa0a8b..328ceaa0b 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -77,6 +77,10 @@ RUN apt clean && rm -rf /var/lib/apt/lists/* # Install sctrace RUN ln -s /root/asterinas/tools/sctrace.sh /usr/local/bin/sctrace +# Set the `ASTER_SCML` env var to make sctrace easier to use for Asterinas developers. +# For more information, check out the README of sctrace. +RUN echo 'export ASTER_SCML=$(find /root/asterinas/book/src/kernel/linux-compatibility/ -name "*.scml")' >> /root/.bashrc + # Copy the gvisor syscall test binaries COPY --from=build-gvisor /root/gvisor/build/syscall_test_bins /root/syscall_test_bins ENV GVISOR_PREBUILT_DIR=/root/syscall_test_bins diff --git a/tools/sctrace.sh b/tools/sctrace.sh index f593f22d5..92874d027 100755 --- a/tools/sctrace.sh +++ b/tools/sctrace.sh @@ -9,8 +9,5 @@ SCRIPT_PATH="$(readlink -f "${BASH_SOURCE[0]}")" SCRIPT_DIR="$(dirname "$SCRIPT_PATH")" ASTERINAS_ROOT="$(dirname "$SCRIPT_DIR")" -# Search all SCML files -scml_files=$(find "$ASTERINAS_ROOT/book/src/kernel/linux-compatibility" -type f -name "*.scml" | tr '\n' ' ') - # Run sctrace with all arguments passed to this script -cargo run -q --manifest-path "$ASTERINAS_ROOT/tools/sctrace/Cargo.toml" -- $scml_files "$@" +cargo run -q --manifest-path "$ASTERINAS_ROOT/tools/sctrace/Cargo.toml" -- "$@"