From f195bb7c2ea5eaecfe4d7835031157d9fb6f35b9 Mon Sep 17 00:00:00 2001 From: Hiroyuki Sato Date: Mon, 2 Jun 2025 14:03:37 +0900 Subject: [PATCH] GH-46699: [CI][Dev] fix shellcheck errors in the ci/scripts/cpp_test.sh --- .pre-commit-config.yaml | 1 + ci/scripts/cpp_test.sh | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c650bf1719f..a8a4916a9f6 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -268,6 +268,7 @@ repos: ?^ci/scripts/c_glib_build\.sh$| ?^ci/scripts/c_glib_test\.sh$| ?^ci/scripts/conan_setup\.sh$| + ?^ci/scripts/cpp_test\.sh$| ?^ci/scripts/csharp_build\.sh$| ?^ci/scripts/csharp_pack\.sh$| ?^ci/scripts/download_tz_database\.sh$| diff --git a/ci/scripts/cpp_test.sh b/ci/scripts/cpp_test.sh index e646ba964a5..60d9dd0a3b7 100755 --- a/ci/scripts/cpp_test.sh +++ b/ci/scripts/cpp_test.sh @@ -19,7 +19,7 @@ set -ex -if [[ $# < 2 ]]; then +if [[ $# -lt 2 ]]; then echo "Usage: $0 [ctest args ...]" exit 1 fi @@ -84,7 +84,7 @@ if [ "${ARROW_EMSCRIPTEN:-OFF}" = "ON" ]; then n_jobs=1 # avoid spurious fails on emscripten due to loading too many big executables fi -pushd ${build_dir} +pushd "${build_dir}" if [ -z "${PYTHON}" ] && ! which python > /dev/null 2>&1; then export PYTHON="${PYTHON:-python3}" @@ -100,15 +100,15 @@ else ctest \ --label-regex unittest \ --output-on-failure \ - --parallel ${n_jobs} \ + --parallel "${n_jobs}" \ --repeat until-pass:3 \ - --timeout ${ARROW_CTEST_TIMEOUT:-300} \ + --timeout "${ARROW_CTEST_TIMEOUT:-300}" \ "${ctest_options[@]}" \ "$@" fi if [ "${ARROW_BUILD_EXAMPLES}" == "ON" ]; then - examples=$(find ${binary_output_dir} -executable -name "*example") + examples=$(find "${binary_output_dir}" -executable -name "*example") if [ "${examples}" == "" ]; then echo "==================" echo "No examples found!" @@ -126,12 +126,12 @@ fi if [ "${ARROW_FUZZING}" == "ON" ]; then # Fuzzing regression tests - ${binary_output_dir}/arrow-ipc-stream-fuzz ${ARROW_TEST_DATA}/arrow-ipc-stream/crash-* - ${binary_output_dir}/arrow-ipc-stream-fuzz ${ARROW_TEST_DATA}/arrow-ipc-stream/*-testcase-* - ${binary_output_dir}/arrow-ipc-file-fuzz ${ARROW_TEST_DATA}/arrow-ipc-file/*-testcase-* - ${binary_output_dir}/arrow-ipc-tensor-stream-fuzz ${ARROW_TEST_DATA}/arrow-ipc-tensor-stream/*-testcase-* + "${binary_output_dir}/arrow-ipc-stream-fuzz" "${ARROW_TEST_DATA}"/arrow-ipc-stream/crash-* + "${binary_output_dir}/arrow-ipc-stream-fuzz" "${ARROW_TEST_DATA}"/arrow-ipc-stream/*-testcase-* + "${binary_output_dir}/arrow-ipc-file-fuzz" "${ARROW_TEST_DATA}"/arrow-ipc-file/*-testcase-* + "${binary_output_dir}/arrow-ipc-tensor-stream-fuzz" "${ARROW_TEST_DATA}"/arrow-ipc-tensor-stream/*-testcase-* if [ "${ARROW_PARQUET}" == "ON" ]; then - ${binary_output_dir}/parquet-arrow-fuzz ${ARROW_TEST_DATA}/parquet/fuzzing/*-testcase-* + "${binary_output_dir}/parquet-arrow-fuzz" "${ARROW_TEST_DATA}"/parquet/fuzzing/*-testcase-* fi fi