You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by ad...@apache.org on 2017/01/14 19:45:22 UTC
kudu git commit: Don't build kudu_test_* if NO_TESTS set
Repository: kudu
Updated Branches:
refs/heads/master 5e932ae57 -> b6acf36cc
Don't build kudu_test_* if NO_TESTS set
Change-Id: I69344fc79cdda30456ab261838c5bc50bab1a420
Reviewed-on: http://gerrit.cloudera.org:8080/5711
Tested-by: Kudu Jenkins
Reviewed-by: Adar Dembo <ad...@cloudera.com>
Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/b6acf36c
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/b6acf36c
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/b6acf36c
Branch: refs/heads/master
Commit: b6acf36cc27c1a70744d0bee433314a650d795f0
Parents: 5e932ae
Author: Henry Robinson <he...@cloudera.com>
Authored: Fri Jan 13 01:09:01 2017 -0800
Committer: Adar Dembo <ad...@cloudera.com>
Committed: Sat Jan 14 19:40:25 2017 +0000
----------------------------------------------------------------------
src/kudu/security/CMakeLists.txt | 26 ++++++++-------
src/kudu/util/CMakeLists.txt | 60 ++++++++++++++++++-----------------
2 files changed, 45 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kudu/blob/b6acf36c/src/kudu/security/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/kudu/security/CMakeLists.txt b/src/kudu/security/CMakeLists.txt
index 2e0b3ee..68a71e2 100644
--- a/src/kudu/security/CMakeLists.txt
+++ b/src/kudu/security/CMakeLists.txt
@@ -47,19 +47,21 @@ ADD_EXPORTABLE_LIBRARY(security
SRCS ${SECURITY_SRCS}
DEPS ${SECURITY_LIBS})
-set(SECURITY_TEST_SRCS
- test/mini_kdc.cc)
+if (NOT NO_TESTS)
+ set(SECURITY_TEST_SRCS
+ test/mini_kdc.cc)
-add_library(security-test ${SECURITY_TEST_SRCS})
-target_link_libraries(security-test
- gutil
- kudu_test_util
- kudu_util)
+ add_library(security-test ${SECURITY_TEST_SRCS})
+ target_link_libraries(security-test
+ gutil
+ kudu_test_util
+ kudu_util)
-# Tests
-set(KUDU_TEST_LINK_LIBS
- security
- security-test
- ${KUDU_MIN_TEST_LIBS})
+ # Tests
+ set(KUDU_TEST_LINK_LIBS
+ security
+ security-test
+ ${KUDU_MIN_TEST_LIBS})
+endif()
ADD_KUDU_TEST(test/mini_kdc-test)
http://git-wip-us.apache.org/repos/asf/kudu/blob/b6acf36c/src/kudu/util/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/kudu/util/CMakeLists.txt b/src/kudu/util/CMakeLists.txt
index 8138972..a6150e2 100644
--- a/src/kudu/util/CMakeLists.txt
+++ b/src/kudu/util/CMakeLists.txt
@@ -231,39 +231,41 @@ ADD_EXPORTABLE_LIBRARY(kudu_util
# kudu_test_util
#######################################
-add_library(kudu_test_util
- test_util.cc
- curl_util.cc)
-target_link_libraries(kudu_test_util
- ${CURL_LIBRARIES}
- gflags
- glog
- gmock
- kudu_util)
-
-if(NOT APPLE)
-target_link_libraries(kudu_test_util
- vmem)
-endif()
+if(NOT NO_TESTS)
+ add_library(kudu_test_util
+ test_util.cc
+ curl_util.cc)
+ target_link_libraries(kudu_test_util
+ ${CURL_LIBRARIES}
+ gflags
+ glog
+ gmock
+ kudu_util)
+
+ if(NOT APPLE)
+ target_link_libraries(kudu_test_util
+ vmem)
+ endif()
#######################################
# kudu_test_main
#######################################
-add_library(kudu_test_main
- test_main.cc)
-target_link_libraries(kudu_test_main
- ${KRB5_REALM_OVERRIDE}
- gflags
- glog
- gmock
- kudu_util
- kudu_test_util)
-
-if(NOT APPLE)
+ add_library(kudu_test_main
+ test_main.cc)
target_link_libraries(kudu_test_main
- dl
- rt)
+ ${KRB5_REALM_OVERRIDE}
+ gflags
+ glog
+ gmock
+ kudu_util
+ kudu_test_util)
+
+ if(NOT APPLE)
+ target_link_libraries(kudu_test_main
+ dl
+ rt)
+ endif()
endif()
#######################################
@@ -368,7 +370,7 @@ target_link_libraries(jsonwriter_test_proto
#######################################
ADD_KUDU_TEST(jsonwriter-test)
-if(NOT "${NO_TESTS}")
+if(NOT NO_TESTS)
target_link_libraries(jsonwriter-test
jsonwriter_test_proto)
endif()
@@ -398,7 +400,7 @@ target_link_libraries(pb_util_test_proto
#######################################
ADD_KUDU_TEST(pb_util-test)
-if(NOT "${NO_TESTS}")
+if(NOT NO_TESTS)
target_link_libraries(pb_util-test
pb_util_test_proto)
endif()