From 3f6e8a8707f6d3ec1218e424e6431484c7871c1f Mon Sep 17 00:00:00 2001 From: Takeshi Nakatani Date: Wed, 15 Nov 2023 12:56:07 +0000 Subject: [PATCH 1/2] Fixed indent in integration-test-main.sh --- test/integration-test-main.sh | 40 +++++++++++++++++------------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/test/integration-test-main.sh b/test/integration-test-main.sh index f3b99e9..0cb788d 100755 --- a/test/integration-test-main.sh +++ b/test/integration-test-main.sh @@ -2260,54 +2260,54 @@ function test_not_existed_dir_obj() { # Top directory # shellcheck disable=SC2010 if ! ls -1 | grep -q '^not_existed_dir_single$'; then - echo "Expect to find \"not_existed_dir_single\" directory, but it is not found" - return 1; + echo "Expect to find \"not_existed_dir_single\" directory, but it is not found" + return 1 fi # shellcheck disable=SC2010 if ! ls -1 | grep -q '^not_existed_dir_parent$'; then - echo "Expect to find \"not_existed_dir_parent\" directory, but it is not found" - return 1; + echo "Expect to find \"not_existed_dir_parent\" directory, but it is not found" + return 1 fi # Single nest directory if ! stat not_existed_dir_single; then - echo "Expect to find \"not_existed_dir_single\" directory, but it is not found" - return 1; + echo "Expect to find \"not_existed_dir_single\" directory, but it is not found" + return 1 fi # shellcheck disable=SC2010 if ! ls -1 not_existed_dir_single | grep -q "^${TEST_TEXT_FILE}\$"; then - echo "Expect to find \"not_existed_dir_single/${TEST_TEXT_FILE}\" file, but it is not found" - return 1; + echo "Expect to find \"not_existed_dir_single/${TEST_TEXT_FILE}\" file, but it is not found" + return 1 fi # shellcheck disable=SC2010 if ! ls -1 "not_existed_dir_single/${TEST_TEXT_FILE}" | grep -q "^not_existed_dir_single/${TEST_TEXT_FILE}\$"; then - echo "Expect to find \"not_existed_dir_single/${TEST_TEXT_FILE}\" file, but it is not found" - return 1; + echo "Expect to find \"not_existed_dir_single/${TEST_TEXT_FILE}\" file, but it is not found" + return 1 fi # Double nest directory if ! stat not_existed_dir_parent; then - echo "Expect to find \"not_existed_dir_parent\" directory, but it is not found" - return 1; + echo "Expect to find \"not_existed_dir_parent\" directory, but it is not found" + return 1 fi # shellcheck disable=SC2010 if ! ls -1 not_existed_dir_parent | grep -q '^not_existed_dir_child'; then - echo "Expect to find \"not_existed_dir_parent/not_existed_dir_child\" directory, but it is not found" - return 1; + echo "Expect to find \"not_existed_dir_parent/not_existed_dir_child\" directory, but it is not found" + return 1 fi if ! stat not_existed_dir_parent/not_existed_dir_child; then - echo "Expect to find \"not_existed_dir_parent/not_existed_dir_child\" directory, but it is not found" - return 1; + echo "Expect to find \"not_existed_dir_parent/not_existed_dir_child\" directory, but it is not found" + return 1 fi # shellcheck disable=SC2010 if ! ls -1 not_existed_dir_parent/not_existed_dir_child | grep -q "^${TEST_TEXT_FILE}\$"; then - echo "Expect to find \"not_existed_dir_parent/not_existed_dir_child/${TEST_TEXT_FILE}\" directory, but it is not found" - return 1; + echo "Expect to find \"not_existed_dir_parent/not_existed_dir_child/${TEST_TEXT_FILE}\" directory, but it is not found" + return 1 fi # shellcheck disable=SC2010 if ! ls -1 "not_existed_dir_parent/not_existed_dir_child/${TEST_TEXT_FILE}" | grep -q "^not_existed_dir_parent/not_existed_dir_child/${TEST_TEXT_FILE}\$"; then - echo "Expect to find \"not_existed_dir_parent/not_existed_dir_child/${TEST_TEXT_FILE}\" directory, but it is not found" - return 1; + echo "Expect to find \"not_existed_dir_parent/not_existed_dir_child/${TEST_TEXT_FILE}\" directory, but it is not found" + return 1 fi rm -rf not_existed_dir_single From 4fdd2456d40f69e102e21c8ce06083e3e17693c8 Mon Sep 17 00:00:00 2001 From: Takeshi Nakatani Date: Wed, 15 Nov 2023 12:35:15 +0000 Subject: [PATCH 2/2] Fixed a script of not functioning environment in Github Actions --- .github/workflows/linux-ci-helper.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/linux-ci-helper.sh b/.github/workflows/linux-ci-helper.sh index 3c1c200..2decac6 100755 --- a/.github/workflows/linux-ci-helper.sh +++ b/.github/workflows/linux-ci-helper.sh @@ -66,8 +66,8 @@ AWSCLI_ZIP_FILE="awscliv2.zip" #----------------------------------------------------------- # Parameters for configure(set environments) #----------------------------------------------------------- -# shellcheck disable=SC2089 -CONFIGURE_OPTIONS="CXXFLAGS='-O -std=c++03 -DS3FS_PTHREAD_ERRORCHECK=1' --prefix=/usr --with-openssl" +CXXFLAGS="-O -DS3FS_PTHREAD_ERRORCHECK=1" +CONFIGURE_OPTIONS="--prefix=/usr --with-openssl" #----------------------------------------------------------- # OS dependent variables @@ -290,8 +290,8 @@ fi #----------------------------------------------------------- echo "${PRGNAME} [INFO] Set environment for configure options" -# shellcheck disable=SC2090 -export CONFIGURE_OPTIONS +echo "CXXFLAGS=${CXXFLAGS}" >> "${GITHUB_ENV}" +echo "CONFIGURE_OPTIONS=${CONFIGURE_OPTIONS}" >> "${GITHUB_ENV}" echo "${PRGNAME} [INFO] Finish Linux helper for installing packages."