Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-09 05:16:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refine the scripts for syscall test

Browse Source
This commit is contained in:
LI Qing 2024-01-03 11:29:28 +08:00 committed by Tate, Hongliang Tian
parent c7cda1df28
commit a883b65187
4 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
regression/syscall_test/Makefile
View File

@ -63,7 +63,7 @@ $(TESTS): $(BIN_DIR) $(TARGET_DIR)
ifndef ASTER_PREBUILT_SYSCALL_TEST ifndef ASTER_PREBUILT_SYSCALL_TEST
$(BIN_DIR): $(SRC_DIR) $(BIN_DIR): $(SRC_DIR)
@if ! type bazel > /dev/null; then \ @if ! type bazel > /dev/null; then \
echo "bazel is not installed, please run $(CUR_DIR)/install_bazel.sh with sudo permission to install it."; \ echo "bazel is not installed, please run tools/install_bazel.sh with sudo permission to install it."; \
exit 1; \ exit 1; \
fi fi
@rm -rf $@ && mkdir -p $@ @rm -rf $@ && mkdir -p $@

2
regression/syscall_test/run_syscall_test.sh
View File

@ -39,7 +39,7 @@ run_one_test(){
ret=0 ret=0
if [ -f $TEST_BIN_DIR/$1 ]; then if [ -f $TEST_BIN_DIR/$1 ]; then
get_blocklist_subtests $1 get_blocklist_subtests $1
$TEST_BIN_DIR/$1 --gtest_filter=-$BLOCK cd $TEST_BIN_DIR && ./$1 --gtest_filter=-$BLOCK
ret=$? ret=$?
#After executing the test, it is necessary to clean the directory to ensure no residual data remains #After executing the test, it is necessary to clean the directory to ensure no residual data remains
rm -rf $TEST_TMP_DIR/* rm -rf $TEST_TMP_DIR/*

7
tools/docker/Dockerfile.ubuntu22.04
View File

@ -64,11 +64,10 @@ RUN rm -rf sysbench-1.0.20 \
FROM build-base as build-bazel FROM build-base as build-bazel
# Install bazel, which is required by the system call test suite from Gvisor project # Install bazel, which is required by the system call test suite from Gvisor project
RUN mkdir -p /root/bazel
COPY tools/install_bazel.sh /root/bazel/
WORKDIR /root/bazel WORKDIR /root/bazel
RUN curl -fsSL https://bazel.build/bazel-release.pub.gpg | gpg --dearmor > bazel.gpg RUN ./install_bazel.sh
RUN mv bazel.gpg /etc/apt/trusted.gpg.d
RUN echo 'deb [arch=amd64] https://storage.googleapis.com/bazel-apt stable jdk1.8' | tee /etc/apt/sources.list.d/bazel.list
RUN apt update && apt install bazel=5.4.0 -y
RUN apt clean && rm -rf /var/lib/apt/lists/* RUN apt clean && rm -rf /var/lib/apt/lists/*
WORKDIR /root WORKDIR /root
RUN rm -rf bazel RUN rm -rf bazel

19
tools/install_bazel.sh Executable file
View File

@ -0,0 +1,19 @@
#! /bin/bash
# SPDX-License-Identifier: MPL-2.0
set -e
if type bazel > /dev/null; then
echo "Bazel has been installed already"
exit 0
fi
apt update && apt install curl gnupg -y
curl -fsSL https://bazel.build/bazel-release.pub.gpg | gpg --dearmor > bazel.gpg
mv bazel.gpg /etc/apt/trusted.gpg.d/
echo 'deb [arch=amd64] https://storage.googleapis.com/bazel-apt stable jdk1.8' | tee /etc/apt/sources.list.d/bazel.list
apt update && apt install bazel=5.4.0 -y
echo "Bazel is installed successfully"