Fix ARROW_TEST_INCLUDE_LABELS option to actually work

Change-Id: I340618da5d9cc575bb09be35340d217a3365771d
This commit is contained in:
Wes McKinney committed 2018-12-14 00:05:45 -06:00
1 parent 578bc58f57
commit 918fdb371b
4 files changed
+16 -11

No files matched your search

+3 -2
View File
@@ -99,9 +99,10 @@ fi
cmake -GNinja \
$CMAKE_COMMON_FLAGS \
-DARROW_BUILD_TESTS=on \
-DARROW_BUILD_TESTS=ON \
-DARROW_BUILD_STATIC=OFF \
-DARROW_TEST_INCLUDE_LABELS=python \
-DARROW_BUILD_UTILITIES=off \
-DARROW_BUILD_UTILITIES=OFF \
-DARROW_OPTIONAL_INSTALL=ON \
-DARROW_PLASMA=on \
-DARROW_TENSORFLOW=on \
+1 -2
View File
@@ -403,7 +403,7 @@ function(ADD_TEST_CASE REL_TEST_NAME)
if (NOT "${ARROW_TEST_INCLUDE_LABELS}" STREQUAL "")
set(_SKIP_TEST TRUE)
foreach (_INCLUDED_LABEL ${ARG_LABELS})
foreach (_INCLUDED_LABEL ${ARROW_TEST_INCLUDE_LABELS})
if ("${ARG_LABELS}" MATCHES "${_INCLUDED_LABEL}")
set(_SKIP_TEST FALSE)
endif()
@@ -583,7 +583,6 @@ function(ARROW_INSTALL_ALL_HEADERS PATH)
set(ARG_PATTERN "*.h")
endif()
file(GLOB CURRENT_DIRECTORY_HEADERS ${ARG_PATTERN})
message(STATUS ${CURRENT_DIRECTORY_HEADERS})
install(FILES
${CURRENT_DIRECTORY_HEADERS}
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${PATH}")
+5 -3
View File
@@ -107,7 +107,9 @@ if (ARROW_BUILD_TESTS)
STATIC_LINK_LIBS "${ARROW_HIVESERVER2_TEST_LINK_LIBS}"
LABELS "arrow_hiveserver2"
)
set_property(TARGET arrow-hiveserver2-test
APPEND_STRING PROPERTY COMPILE_FLAGS
" -Wno-shadow-field")
if (TARGET arrow-hiveserver2-test)
set_property(TARGET arrow-hiveserver2-test
APPEND_STRING PROPERTY COMPILE_FLAGS
" -Wno-shadow-field")
endif()
endif(ARROW_BUILD_TESTS)
+7 -4
View File
@@ -140,11 +140,14 @@ function(ADD_GANDIVA_TEST REL_TEST_NAME)
STATIC_LINK_LIBS ${GANDIVA_SHARED_TEST_LINK_LIBS})
endif()
if(${REL_TEST_NAME} MATCHES "llvm" OR
${REL_TEST_NAME} MATCHES "expression_registry")
set(TARGET_NAME gandiva-${REL_TEST_NAME})
if((TARGET ${TARGET_NAME}) AND
(${REL_TEST_NAME} MATCHES "llvm" OR
${REL_TEST_NAME} MATCHES "expression_registry"))
# If the unit test has llvm in its name, include llvm.
add_dependencies(gandiva-${REL_TEST_NAME} LLVM::LLVM_INTERFACE)
target_link_libraries(gandiva-${REL_TEST_NAME} PRIVATE LLVM::LLVM_INTERFACE)
add_dependencies(${TARGET_NAME} LLVM::LLVM_INTERFACE)
target_link_libraries(${TARGET_NAME} PRIVATE LLVM::LLVM_INTERFACE)
endif()
endfunction()