From 7cd41349d1b982ca950c691fbce942b48147b000 Mon Sep 17 00:00:00 2001 From: Hsy-Intel Date: Fri, 9 May 2025 09:20:40 +0800 Subject: [PATCH] Fix yq installation issue --- osdk/tools/docker/Dockerfile | 2 +- test/benchmark/bench_linux_and_aster.sh | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/osdk/tools/docker/Dockerfile b/osdk/tools/docker/Dockerfile index 9158f149..79270992 100644 --- a/osdk/tools/docker/Dockerfile +++ b/osdk/tools/docker/Dockerfile @@ -12,7 +12,7 @@ RUN apt update && apt-get install -y --no-install-recommends \ python-is-python3 \ wget -RUN pip3 install iq tomli +RUN pip3 install yq tomli #= Build QEMU ================================================================= diff --git a/test/benchmark/bench_linux_and_aster.sh b/test/benchmark/bench_linux_and_aster.sh index 7f344eb7..45c4716e 100755 --- a/test/benchmark/bench_linux_and_aster.sh +++ b/test/benchmark/bench_linux_and_aster.sh @@ -6,7 +6,14 @@ set -e set -o pipefail # Ensure all dependencies are installed -command -v yq >/dev/null 2>&1 || command -v yq >/dev/null 2>&1 || { echo >&2 "tools are not installed. Aborting."; exit 1; } +if ! command -v yq >/dev/null 2>&1; then + echo >&2 "Error: missing required tool: yq" + exit 1 +fi +if ! command -v jq >/dev/null 2>&1; then + echo >&2 "Error: missing required tool: jq" + exit 1 +fi # Set up paths BENCHMARK_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"