[arrow] branch master updated: ARROW-3195: [C++] Add missing error check for NumPy initialization in test

[uw...@apache.org]

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 92b6863  ARROW-3195: [C++] Add missing error check for NumPy initialization in test
92b6863 is described below

commit 92b6863a8d12d65d7139925a3de01e8db8e58d12
Author: Kouhei Sutou <ko...@clear-code.com>
AuthorDate: Sun Sep 9 11:08:58 2018 +0200

    ARROW-3195: [C++] Add missing error check for NumPy initialization in test
    
    Author: Kouhei Sutou <ko...@clear-code.com>
    
    Closes #2525 from kou/cpp-add-missing-numpy-init-error-check-in-test and squashes the following commits:
    
    0134d84c <Kouhei Sutou>  Add missing error check for NumPy initialization in test
---
 cpp/src/arrow/python/util/test_main.cc | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/cpp/src/arrow/python/util/test_main.cc b/cpp/src/arrow/python/util/test_main.cc
index efb4475..a59d58e 100644
--- a/cpp/src/arrow/python/util/test_main.cc
+++ b/cpp/src/arrow/python/util/test_main.cc
@@ -25,9 +25,12 @@ int main(int argc, char** argv) {
   ::testing::InitGoogleTest(&argc, argv);
 
   Py_Initialize();
-  arrow_init_numpy();
+  int ret = arrow_init_numpy();
+  if (ret != 0) {
+    return ret;
+  }
 
-  int ret = RUN_ALL_TESTS();
+  ret = RUN_ALL_TESTS();
 
   Py_Finalize();