You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ko...@apache.org on 2020/06/10 22:07:07 UTC

[arrow] branch master updated: ARROW-9092: [C++][TRIAGE] Do not enable TestRoundFunctions when using LLVM 9 until gandiva-decimal-test is fixed

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

kou 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 6708902  ARROW-9092: [C++][TRIAGE] Do not enable TestRoundFunctions when using LLVM 9 until gandiva-decimal-test is fixed
6708902 is described below

commit 67089022985461cdf622348c0e0d48c21f448c42
Author: Wes McKinney <we...@apache.org>
AuthorDate: Thu Jun 11 07:06:42 2020 +0900

    ARROW-9092: [C++][TRIAGE] Do not enable TestRoundFunctions when using LLVM 9 until gandiva-decimal-test is fixed
    
    This unblocks LLVM 9 users from running the test suite. Whoever merges this, please leave the JIRA issue open.
    
    Closes #7396 from wesm/ARROW-9092-triage
    
    Authored-by: Wes McKinney <we...@apache.org>
    Signed-off-by: Sutou Kouhei <ko...@clear-code.com>
---
 cpp/src/gandiva/CMakeLists.txt        | 2 ++
 cpp/src/gandiva/tests/decimal_test.cc | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/cpp/src/gandiva/CMakeLists.txt b/cpp/src/gandiva/CMakeLists.txt
index 8d33fa9..f367045 100644
--- a/cpp/src/gandiva/CMakeLists.txt
+++ b/cpp/src/gandiva/CMakeLists.txt
@@ -34,6 +34,8 @@ else()
   set(GANDIVA_CXX_STANDARD 14)
 endif()
 
+add_definitions(-DGANDIVA_LLVM_VERSION=${LLVM_VERSION_MAJOR})
+
 # Set the path where the bitcode file generated, see precompiled/CMakeLists.txt
 set(GANDIVA_PRECOMPILED_BC_PATH "${CMAKE_CURRENT_BINARY_DIR}/irhelpers.bc")
 set(GANDIVA_PRECOMPILED_CC_PATH "${CMAKE_CURRENT_BINARY_DIR}/precompiled_bitcode.cc")
diff --git a/cpp/src/gandiva/tests/decimal_test.cc b/cpp/src/gandiva/tests/decimal_test.cc
index 9b445b4..99bc009 100644
--- a/cpp/src/gandiva/tests/decimal_test.cc
+++ b/cpp/src/gandiva/tests/decimal_test.cc
@@ -301,6 +301,10 @@ TEST_F(TestDecimal, TestCompare) {
                             outputs[5]);  // greater_than_or_equal_to
 }
 
+// ARROW-9092: This test is conditionally disabled when building with LLVM 9
+// because it hangs.
+#if GANDIVA_LLVM_VERSION != 9
+
 TEST_F(TestDecimal, TestRoundFunctions) {
   // schema for input fields
   constexpr int32_t precision = 38;
@@ -404,6 +408,8 @@ TEST_F(TestDecimal, TestRoundFunctions) {
       outputs[6]);
 }
 
+#endif  // GANDIVA_LLVM_VERSION != 9
+
 TEST_F(TestDecimal, TestCastFunctions) {
   // schema for input fields
   constexpr int32_t precision = 38;