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/10/17 19:41:12 UTC
kudu git commit: tserver: condition tserver_test_util on NO_TESTS=0
Repository: kudu
Updated Branches:
refs/heads/master 294a8fa65 -> 827c35bc3
tserver: condition tserver_test_util on NO_TESTS=0
Commit 3a7342a introduced a dependency from tserver_test_util to
kudu_test_main (via KUDU_MIN_TEST_LIBS), but kudu_test_main is only
available if we're building tests. So, to unbreak the test-less build, we
need to condition tserver_test_util on NO_TESTS=0.
Our precommit builds don't set NO_TESTS, so I tested this locally via a
NO_TESTS build on a fresh build directory.
Change-Id: Ibf4ac419851463dcc3536e15b488d8ed388130af
Reviewed-on: http://gerrit.cloudera.org:8080/8299
Reviewed-by: Alexey Serbin <as...@cloudera.com>
Reviewed-by: Todd Lipcon <to...@apache.org>
Tested-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/827c35bc
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/827c35bc
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/827c35bc
Branch: refs/heads/master
Commit: 827c35bc356640ef13d85278043f9e10b5d30079
Parents: 294a8fa
Author: Adar Dembo <ad...@cloudera.com>
Authored: Tue Oct 17 10:46:39 2017 -0700
Committer: Adar Dembo <ad...@cloudera.com>
Committed: Tue Oct 17 19:40:57 2017 +0000
----------------------------------------------------------------------
src/kudu/tserver/CMakeLists.txt | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kudu/blob/827c35bc/src/kudu/tserver/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/CMakeLists.txt b/src/kudu/tserver/CMakeLists.txt
index 938e88a..c848f95 100644
--- a/src/kudu/tserver/CMakeLists.txt
+++ b/src/kudu/tserver/CMakeLists.txt
@@ -150,15 +150,17 @@ target_link_libraries(kudu-tserver
# tserver_test_util
#########################################
-set(TSERVER_TEST_UTIL_SRCS
- tablet_server_test_util.cc
- tablet_server-test-base.cc
-)
-
-add_library(tserver_test_util ${TSERVER_TEST_UTIL_SRCS})
-target_link_libraries(tserver_test_util
- tserver
- ${KUDU_MIN_TEST_LIBS})
+if (NOT NO_TESTS)
+ set(TSERVER_TEST_UTIL_SRCS
+ tablet_server_test_util.cc
+ tablet_server-test-base.cc
+ )
+
+ add_library(tserver_test_util ${TSERVER_TEST_UTIL_SRCS})
+ target_link_libraries(tserver_test_util
+ tserver
+ ${KUDU_MIN_TEST_LIBS})
+endif()
#########################################
# tserver tests