This is an automated email from the ASF dual-hosted git repository.
uwe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 000d529 ARROW-4537: [CI] Suppress shell warning on travis-ci
000d529 is described below
commit 000d52904aede585714347a630f2d2d1f5f94824
Author: Kenta Murata <[email protected]>
AuthorDate: Tue Feb 12 15:27:01 2019 +0100
ARROW-4537: [CI] Suppress shell warning on travis-ci
Enclose optional shell variable names by double quotations to suppress
shell warnings that is like below:
```
+'[' == 1 ']'
/home/travis/build/apache/arrow/ci/travis_before_script_cpp.sh: line 81: [:
==: unary operator expected
```
Author: Kenta Murata <[email protected]>
Closes #3623 from mrkn/suppress_shell_warning_on_ci and squashes the
following commits:
4db2e53d <Kenta Murata> Suppress shell warning on travis-ci
---
ci/travis_before_script_cpp.sh | 26 +++++++++++++-------------
ci/travis_install_toolchain.sh | 4 ++--
ci/travis_script_python.sh | 6 +++---
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/ci/travis_before_script_cpp.sh b/ci/travis_before_script_cpp.sh
index 76ae9a6..6c65cd6 100755
--- a/ci/travis_before_script_cpp.sh
+++ b/ci/travis_before_script_cpp.sh
@@ -78,7 +78,7 @@ fi
ARROW_CXXFLAGS=""
# Use Ninja for faster builds when using toolchain
-if [ $ARROW_TRAVIS_USE_TOOLCHAIN == "1" ]; then
+if [ "$ARROW_TRAVIS_USE_TOOLCHAIN" == "1" ]; then
CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS -GNinja"
if [ "$DISTRO_CODENAME" != "trusty" ]; then
# Make sure the toolchain linker (from binutils package) is picked up by
clang
@@ -86,53 +86,53 @@ if [ $ARROW_TRAVIS_USE_TOOLCHAIN == "1" ]; then
fi
fi
-if [ $ARROW_TRAVIS_PLASMA == "1" ]; then
+if [ "$ARROW_TRAVIS_PLASMA" == "1" ]; then
CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS -DARROW_PLASMA=ON"
fi
-if [ $ARROW_TRAVIS_PLASMA_JAVA_CLIENT == "1" ]; then
+if [ "$ARROW_TRAVIS_PLASMA_JAVA_CLIENT" == "1" ]; then
CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS -DARROW_PLASMA_JAVA_CLIENT=ON"
fi
-if [ $ARROW_TRAVIS_ORC == "1" ]; then
+if [ "$ARROW_TRAVIS_ORC" == "1" ]; then
CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS -DARROW_ORC=ON"
fi
-if [ $ARROW_TRAVIS_PARQUET == "1" ]; then
+if [ "$ARROW_TRAVIS_PARQUET" == "1" ]; then
CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS \
-DARROW_PARQUET=ON \
-DPARQUET_BUILD_EXAMPLES=ON \
-DPARQUET_BUILD_EXECUTABLES=ON"
fi
-if [ $ARROW_TRAVIS_GANDIVA == "1" ]; then
+if [ "$ARROW_TRAVIS_GANDIVA" == "1" ]; then
CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS -DARROW_GANDIVA=ON"
- if [ $ARROW_TRAVIS_GANDIVA_JAVA == "1" ]; then
+ if [ "$ARROW_TRAVIS_GANDIVA_JAVA" == "1" ]; then
CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS -DARROW_GANDIVA_JAVA=ON"
fi
fi
-if [ $ARROW_TRAVIS_VALGRIND == "1" ]; then
+if [ "$ARROW_TRAVIS_VALGRIND" == "1" ]; then
CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS -DARROW_TEST_MEMCHECK=ON"
fi
-if [ $ARROW_TRAVIS_COVERAGE == "1" ]; then
+if [ "$ARROW_TRAVIS_COVERAGE" == "1" ]; then
CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS -DARROW_GENERATE_COVERAGE=ON"
fi
-if [ $ARROW_TRAVIS_VERBOSE == "1" ]; then
+if [ "$ARROW_TRAVIS_VERBOSE" == "1" ]; then
CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS -DARROW_VERBOSE_THIRDPARTY_BUILD=ON"
fi
-if [ $ARROW_TRAVIS_VENDORED_BOOST == "1" ]; then
+if [ "$ARROW_TRAVIS_VENDORED_BOOST" == "1" ]; then
CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS -DARROW_BOOST_VENDORED=ON"
fi
-if [ $ARROW_TRAVIS_STATIC_BOOST == "1" ]; then
+if [ "$ARROW_TRAVIS_STATIC_BOOST" == "1" ]; then
CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS -DARROW_BOOST_USE_SHARED=OFF"
fi
-if [ $ARROW_TRAVIS_OPTIONAL_INSTALL == "1" ]; then
+if [ "$ARROW_TRAVIS_OPTIONAL_INSTALL" == "1" ]; then
CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS -DARROW_OPTIONAL_INSTALL=ON"
fi
diff --git a/ci/travis_install_toolchain.sh b/ci/travis_install_toolchain.sh
index defc7ec..4d674a1 100755
--- a/ci/travis_install_toolchain.sh
+++ b/ci/travis_install_toolchain.sh
@@ -25,7 +25,7 @@ if [ ! -e $CPP_TOOLCHAIN ]; then
CONDA_PACKAGES=""
CONDA_LABEL=""
- if [ $ARROW_TRAVIS_GANDIVA == "1" ] && [ $TRAVIS_OS_NAME == "osx" ]; then
+ if [ "$ARROW_TRAVIS_GANDIVA" == "1" ] && [ $TRAVIS_OS_NAME == "osx" ]; then
CONDA_PACKAGES="$CONDA_PACKAGES llvmdev=$CONDA_LLVM_VERSION"
fi
@@ -38,7 +38,7 @@ if [ ! -e $CPP_TOOLCHAIN ]; then
fi
fi
- if [ $ARROW_TRAVIS_VALGRIND == "1" ]; then
+ if [ "$ARROW_TRAVIS_VALGRIND" == "1" ]; then
# Use newer Valgrind
CONDA_PACKAGES="$CONDA_PACKAGES valgrind"
fi
diff --git a/ci/travis_script_python.sh b/ci/travis_script_python.sh
index a5e3cbd..99126e5 100755
--- a/ci/travis_script_python.sh
+++ b/ci/travis_script_python.sh
@@ -90,11 +90,11 @@ CMAKE_COMMON_FLAGS="-DARROW_EXTRA_ERROR_CONTEXT=ON"
PYTHON_CPP_BUILD_TARGETS="arrow_python-all plasma parquet"
-if [ $ARROW_TRAVIS_COVERAGE == "1" ]; then
+if [ "$ARROW_TRAVIS_COVERAGE" == "1" ]; then
CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS -DARROW_GENERATE_COVERAGE=ON"
fi
-if [ $ARROW_TRAVIS_PYTHON_GANDIVA == "1" ]; then
+if [ "$ARROW_TRAVIS_PYTHON_GANDIVA" == "1" ]; then
CMAKE_COMMON_FLAGS="$CMAKE_COMMON_FLAGS -DARROW_GANDIVA=ON"
PYTHON_CPP_BUILD_TARGETS="$PYTHON_CPP_BUILD_TARGETS gandiva"
fi
@@ -140,7 +140,7 @@ export PYARROW_BUILD_TYPE=$ARROW_BUILD_TYPE
export PYARROW_WITH_PARQUET=1
export PYARROW_WITH_PLASMA=1
export PYARROW_WITH_ORC=1
-if [ $ARROW_TRAVIS_PYTHON_GANDIVA == "1" ]; then
+if [ "$ARROW_TRAVIS_PYTHON_GANDIVA" == "1" ]; then
export PYARROW_WITH_GANDIVA=1
fi
