diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ea712e5b2..6ae591aa2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -124,8 +124,8 @@ jobs: # This job doesn't work with GitHub Actions using macOS 11+ because "load_osxfuse" returns # "exit code = 1".(requires OS reboot) # - macos-13: - runs-on: macos-13 + macos-14: + runs-on: macos-14 steps: - name: Checkout source code @@ -140,7 +140,10 @@ jobs: - name: Install fuse-t run: | - HOMEBREW_NO_AUTO_UPDATE=1 brew install fuse-t + # [NOTE] + # Install macfuse to install fuse.h and fuse related headers. + # + HOMEBREW_NO_AUTO_UPDATE=1 brew install macfuse fuse-t - name: Install brew other packages run: | @@ -158,7 +161,7 @@ jobs: - name: Build run: | ./autogen.sh - PKG_CONFIG_PATH=/usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/openssl/lib/pkgconfig ./configure CXXFLAGS='-std=c++11 -DS3FS_PTHREAD_ERRORCHECK=1' + PKG_CONFIG_PATH=/usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/openssl/lib/pkgconfig ./configure CXXFLAGS='-std=c++11 -DS3FS_PTHREAD_ERRORCHECK=1 -I/usr/loval/include/fuse' make --jobs=$(sysctl -n hw.ncpu) - name: Cppcheck diff --git a/test/integration-test-common.sh b/test/integration-test-common.sh index 2a561fe52..2d4ce89fa 100644 --- a/test/integration-test-common.sh +++ b/test/integration-test-common.sh @@ -174,7 +174,8 @@ function start_s3proxy { S3PROXY_CACERT_FILE="" fi - "${STDBUF_BIN}" -oL -eL java -jar "${S3PROXY_BINARY}" --properties "${S3PROXY_CONFIG}" & + #"${STDBUF_BIN}" -oL -eL java -jar "${S3PROXY_BINARY}" --properties "${S3PROXY_CONFIG}" & + java -jar "${S3PROXY_BINARY}" --properties "${S3PROXY_CONFIG}" & S3PROXY_PID=$! # wait for S3Proxy to start @@ -188,7 +189,8 @@ function start_s3proxy { chmod +x "${CHAOS_HTTP_PROXY_BINARY}" fi - "${STDBUF_BIN}" -oL -eL java -jar "${CHAOS_HTTP_PROXY_BINARY}" --properties chaos-http-proxy.conf & + #"${STDBUF_BIN}" -oL -eL java -jar "${CHAOS_HTTP_PROXY_BINARY}" --properties chaos-http-proxy.conf & + java -jar "${CHAOS_HTTP_PROXY_BINARY}" --properties chaos-http-proxy.conf & CHAOS_HTTP_PROXY_PID=$! # wait for Chaos HTTP Proxy to start @@ -294,9 +296,9 @@ function start_s3fs { # subshell with set -x to log exact invocation of s3fs-fuse # shellcheck disable=SC2086 ( + # ${STDBUF_BIN} -oL -eL \ # set -x CURL_CA_BUNDLE="${S3PROXY_CACERT_FILE}" \ - ${STDBUF_BIN} -oL -eL \ ${VALGRIND_EXEC} \ ${S3FS} \ ${TEST_BUCKET_1} \ @@ -319,7 +321,8 @@ function start_s3fs { -f \ "${@}" & echo $! >&3 - ) 3>pid | "${STDBUF_BIN}" -oL -eL "${SED_BIN}" "${SED_BUFFER_FLAG}" "s/^/s3fs: /" & + ) 3>pid | "${SED_BIN}" "${SED_BUFFER_FLAG}" "s/^/s3fs: /" & + #) 3>pid | "${STDBUF_BIN}" -oL -eL "${SED_BIN}" "${SED_BUFFER_FLAG}" "s/^/s3fs: /" & sleep 1 S3FS_PID=$(