kudu-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject kudu git commit: cmake: rename integration-tests and mini-cluster
Date Thu, 05 Oct 2017 04:43:45 GMT
Repository: kudu
Updated Branches:
  refs/heads/master 8101bad58 -> a2485f501


cmake: rename integration-tests and mini-cluster

They are now called itest_util and mini_cluster, to be more consistent with
how we name our other cmake "library" modules.

Change-Id: I6afe9487279b65e342e529602127225536afb574
Reviewed-on: http://gerrit.cloudera.org:8080/8210
Tested-by: Kudu Jenkins
Reviewed-by: Adar Dembo <adar@cloudera.com>


Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/a2485f50
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/a2485f50
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/a2485f50

Branch: refs/heads/master
Commit: a2485f501c5e1aba43730abbbf32ee4393732fd0
Parents: 8101bad
Author: Adar Dembo <adar@cloudera.com>
Authored: Tue Oct 3 13:03:31 2017 -0700
Committer: Adar Dembo <adar@cloudera.com>
Committed: Thu Oct 5 04:43:31 2017 +0000

----------------------------------------------------------------------
 src/kudu/benchmarks/CMakeLists.txt        |  4 ++--
 src/kudu/client/CMakeLists.txt            |  4 ++--
 src/kudu/integration-tests/CMakeLists.txt | 10 +++++-----
 src/kudu/mini-cluster/CMakeLists.txt      |  8 ++++----
 src/kudu/tools/CMakeLists.txt             |  4 ++--
 5 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kudu/blob/a2485f50/src/kudu/benchmarks/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/kudu/benchmarks/CMakeLists.txt b/src/kudu/benchmarks/CMakeLists.txt
index 090370a..28825dc 100644
--- a/src/kudu/benchmarks/CMakeLists.txt
+++ b/src/kudu/benchmarks/CMakeLists.txt
@@ -26,8 +26,8 @@ set(TPCH_SRCS
 
 add_library(tpch ${TPCH_SRCS})
 target_link_libraries(tpch
-  kudu_client
-  integration-tests)
+  itest_util
+  kudu_client)
 
 # tpch1
 add_executable(tpch1 tpch/tpch1.cc)

http://git-wip-us.apache.org/repos/asf/kudu/blob/a2485f50/src/kudu/client/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/kudu/client/CMakeLists.txt b/src/kudu/client/CMakeLists.txt
index d23e98d..a78d300 100644
--- a/src/kudu/client/CMakeLists.txt
+++ b/src/kudu/client/CMakeLists.txt
@@ -255,9 +255,9 @@ if(NOT "${KUDU_USE_ASAN}" AND NOT "${KUDU_USE_TSAN}")
   ADD_KUDU_TEST(client_samples-test.sh RUN_SERIAL true LABELS no_dist_test)
 endif()
 set(KUDU_TEST_LINK_LIBS
-  integration-tests
+  itest_util
   kudu_client
-  mini-cluster
+  mini_cluster
   ${KUDU_MIN_TEST_LIBS})
 ADD_KUDU_TEST(client-test)
 ADD_KUDU_TEST(client-unittest)

http://git-wip-us.apache.org/repos/asf/kudu/blob/a2485f50/src/kudu/integration-tests/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/kudu/integration-tests/CMakeLists.txt b/src/kudu/integration-tests/CMakeLists.txt
index 82c144d..968ef19 100644
--- a/src/kudu/integration-tests/CMakeLists.txt
+++ b/src/kudu/integration-tests/CMakeLists.txt
@@ -30,12 +30,12 @@ set(INTEGRATION_TESTS_SRCS
   test_workload.cc
 )
 
-add_library(integration-tests ${INTEGRATION_TESTS_SRCS})
-target_link_libraries(integration-tests
+add_library(itest_util ${INTEGRATION_TESTS_SRCS})
+target_link_libraries(itest_util
   tserver
   tserver_test_util
   master
-  mini-cluster
+  mini_cluster
   ksck
   kudu_client
   kudu_client_test_util
@@ -44,12 +44,12 @@ target_link_libraries(integration-tests
   kudu_test_util
   kudu_tools_util
   security_test_util)
-add_dependencies(integration-tests
+add_dependencies(itest_util
   kudu-tserver
   kudu-master)
 
 # Tests
-set(KUDU_TEST_LINK_LIBS integration-tests ${KUDU_MIN_TEST_LIBS})
+set(KUDU_TEST_LINK_LIBS itest_util ${KUDU_MIN_TEST_LIBS})
 ADD_KUDU_TEST(all_types-itest RESOURCE_LOCK "master-rpc-ports")
 ADD_KUDU_TEST(alter_table-randomized-test)
 ADD_KUDU_TEST(alter_table-test)

http://git-wip-us.apache.org/repos/asf/kudu/blob/a2485f50/src/kudu/mini-cluster/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/kudu/mini-cluster/CMakeLists.txt b/src/kudu/mini-cluster/CMakeLists.txt
index 1c51273..f1cc253 100644
--- a/src/kudu/mini-cluster/CMakeLists.txt
+++ b/src/kudu/mini-cluster/CMakeLists.txt
@@ -21,8 +21,8 @@ set(MINI_CLUSTER_SRCS
   mini_cluster.cc
 )
 
-add_library(mini-cluster ${MINI_CLUSTER_SRCS})
-target_link_libraries(mini-cluster
+add_library(mini_cluster ${MINI_CLUSTER_SRCS})
+target_link_libraries(mini_cluster
   gflags
   glog
   gmock
@@ -43,10 +43,10 @@ target_link_libraries(mini-cluster
   tserver_service_proto
   wire_protocol_proto
 )
-add_dependencies(mini-cluster
+add_dependencies(mini_cluster
   kudu-tserver
   kudu-master)
 
 # Tests
-set(KUDU_TEST_LINK_LIBS mini-cluster ${KUDU_MIN_TEST_LIBS})
+set(KUDU_TEST_LINK_LIBS mini_cluster ${KUDU_MIN_TEST_LIBS})
 ADD_KUDU_TEST(external_mini_cluster-test RESOURCE_LOCK "master-rpc-ports")

http://git-wip-us.apache.org/repos/asf/kudu/blob/a2485f50/src/kudu/tools/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/kudu/tools/CMakeLists.txt b/src/kudu/tools/CMakeLists.txt
index 9d289dd..c7ebb41 100644
--- a/src/kudu/tools/CMakeLists.txt
+++ b/src/kudu/tools/CMakeLists.txt
@@ -99,8 +99,8 @@ set(KUDU_TEST_LINK_LIBS
   ksck
   kudu_tools_util
   kudu_tools_test_util
-  integration-tests
-  mini-cluster
+  itest_util
+  mini_cluster
   ${KUDU_MIN_TEST_LIBS})
 ADD_KUDU_TEST(ksck-test)
 ADD_KUDU_TEST(ksck_remote-test RESOURCE_LOCK "master-rpc-ports")


Mime
View raw message