[arrow] branch master updated: ARROW-4837: [C++] Support c++filt on a custom path in the run-test.sh script

[ks...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kszucs 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 0fb9e58  ARROW-4837: [C++] Support c++filt on a custom path in the run-test.sh script
0fb9e58 is described below

commit 0fb9e58a30ee14cfeac6a627b6f5abbcc7d84443
Author: Krisztián Szűcs <sz...@gmail.com>
AuthorDate: Tue Mar 12 15:46:19 2019 +0100

    ARROW-4837: [C++] Support c++filt on a custom path in the run-test.sh script
    
    On conda this is `CXXFILT=/opt/conda/bin/x86_64-conda_cos6-linux-gnu-c++filt`
    
    Author: Krisztián Szűcs <sz...@gmail.com>
    
    Closes #3874 from kszucs/filt and squashes the following commits:
    
    1a9128b3 <Krisztián Szűcs> use ninja test in the alpine image
    4a3c9236 <Krisztián Szűcs> use CXXFILT
---
 cpp/Dockerfile                | 2 +-
 cpp/Dockerfile.alpine         | 2 +-
 cpp/build-support/run-test.sh | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cpp/Dockerfile b/cpp/Dockerfile
index b570bf6..f1eafd4 100644
--- a/cpp/Dockerfile
+++ b/cpp/Dockerfile
@@ -56,4 +56,4 @@ ENV CC=gcc \
 
 # build and test
 CMD arrow/ci/docker_build_cpp.sh && \
-    cd /build/cpp && ctest -j2 --output-on-failure -L unittest
+    cd /build/cpp && ninja test
diff --git a/cpp/Dockerfile.alpine b/cpp/Dockerfile.alpine
index 28a815f..4f04d87 100644
--- a/cpp/Dockerfile.alpine
+++ b/cpp/Dockerfile.alpine
@@ -45,4 +45,4 @@ ENV CC=gcc \
 
 # build and test
 CMD arrow/ci/docker_build_cpp.sh && \
-    cd /build/cpp && ctest -j2 --output-on-failure -L unittest
+    cd /build/cpp && ninja test
diff --git a/cpp/build-support/run-test.sh b/cpp/build-support/run-test.sh
index 6b1c09e..aa3e1ec 100755
--- a/cpp/build-support/run-test.sh
+++ b/cpp/build-support/run-test.sh
@@ -103,7 +103,7 @@ function run_test() {
 
   $TEST_EXECUTABLE "$@" 2>&1 \
     | $ROOT/build-support/asan_symbolize.py \
-    | c++filt \
+    | ${CXXFILT:-c++filt} \
     | $ROOT/build-support/stacktrace_addr2line.pl $TEST_EXECUTABLE \
     | $pipe_cmd 2>&1 | tee $LOGFILE
   STATUS=$?