kudu-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject kudu git commit: build: disable more binaries/libraries when NO_TESTS=1
Date Sun, 15 Jan 2017 02:02:56 GMT
Repository: kudu
Updated Branches:
  refs/heads/master b6acf36cc -> 6e683a00d


build: disable more binaries/libraries when NO_TESTS=1

Fallout from commit b6acf36. These all depend on on kudu_test_main or
kudu_test_util (or both).

Change-Id: I187f2cce48d37be7be73de9c990ddb40306c6959
Reviewed-on: http://gerrit.cloudera.org:8080/5722
Reviewed-by: Adar Dembo <adar@cloudera.com>
Tested-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/6e683a00
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/6e683a00
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/6e683a00

Branch: refs/heads/master
Commit: 6e683a00d726e3ab45f592d85a9b72a5a9d42321
Parents: b6acf36
Author: Adar Dembo <adar@cloudera.com>
Authored: Sat Jan 14 17:48:31 2017 -0800
Committer: Adar Dembo <adar@cloudera.com>
Committed: Sun Jan 15 02:02:30 2017 +0000

----------------------------------------------------------------------
 src/kudu/benchmarks/CMakeLists.txt        |  8 ++++++--
 src/kudu/experiments/CMakeLists.txt       |  8 ++++++--
 src/kudu/integration-tests/CMakeLists.txt |  5 +++++
 src/kudu/twitter-demo/CMakeLists.txt      | 24 +++++++++++++-----------
 4 files changed, 30 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kudu/blob/6e683a00/src/kudu/benchmarks/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/kudu/benchmarks/CMakeLists.txt b/src/kudu/benchmarks/CMakeLists.txt
index dce7047..090370a 100644
--- a/src/kudu/benchmarks/CMakeLists.txt
+++ b/src/kudu/benchmarks/CMakeLists.txt
@@ -15,6 +15,11 @@
 # specific language governing permissions and limitations
 # under the License.
 
+# Everything in this module depends on test infrastructure.
+if (NO_TESTS)
+  return()
+endif()
+
 set(TPCH_SRCS
   tpch/rpc_line_item_dao.cc
 )
@@ -42,8 +47,7 @@ target_link_libraries(rle
   kudu_util
   ${KUDU_TEST_LINK_LIBS})
 
-# wal_hiccup
-# Disabled on OS X since it relies on fdatasync and sync_file_range.
+# Disabled on macOS since it relies on fdatasync() and sync_file_range().
 if(NOT APPLE)
   add_executable(wal_hiccup wal_hiccup.cc)
   target_link_libraries(wal_hiccup

http://git-wip-us.apache.org/repos/asf/kudu/blob/6e683a00/src/kudu/experiments/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/kudu/experiments/CMakeLists.txt b/src/kudu/experiments/CMakeLists.txt
index f7fffb8..bbed26e 100644
--- a/src/kudu/experiments/CMakeLists.txt
+++ b/src/kudu/experiments/CMakeLists.txt
@@ -15,8 +15,12 @@
 # specific language governing permissions and limitations
 # under the License.
 
-# rwlock-perf
-# Disabled on OS X because it relies on sched_getcpu.
+# Everything in this module depends on test infrastructure.
+if (NO_TESTS)
+  return()
+endif()
+
+# Disabled on macOS because it relies on sched_getcpu().
 if(NOT APPLE)
   add_executable(rwlock-perf rwlock-perf.cc)
   target_link_libraries(rwlock-perf

http://git-wip-us.apache.org/repos/asf/kudu/blob/6e683a00/src/kudu/integration-tests/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/kudu/integration-tests/CMakeLists.txt b/src/kudu/integration-tests/CMakeLists.txt
index fdea290..e119bbe 100644
--- a/src/kudu/integration-tests/CMakeLists.txt
+++ b/src/kudu/integration-tests/CMakeLists.txt
@@ -15,6 +15,11 @@
 # specific language governing permissions and limitations
 # under the License.
 
+# Everything in this module is test-related.
+if (NO_TESTS)
+  return()
+endif()
+
 set(INTEGRATION_TESTS_SRCS
   cluster_itest_util.cc
   cluster_verifier.cc

http://git-wip-us.apache.org/repos/asf/kudu/blob/6e683a00/src/kudu/twitter-demo/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/kudu/twitter-demo/CMakeLists.txt b/src/kudu/twitter-demo/CMakeLists.txt
index 484f2d1..ebdc5e5 100644
--- a/src/kudu/twitter-demo/CMakeLists.txt
+++ b/src/kudu/twitter-demo/CMakeLists.txt
@@ -15,6 +15,11 @@
 # specific language governing permissions and limitations
 # under the License.
 
+# Everything in this module depends on test infrastructure.
+if (NO_TESTS)
+  return()
+endif()
+
 # Use pkgconfig to configure the build regarding liboauth. This allows
 # to extract info on include and library paths, etc. The liboauth library
 # is installed at alternative location on MacOS X.
@@ -58,16 +63,13 @@ else()
     # parser-test relies on symlinked data files which we can't currently copy correctly
     # to the cluster.
     ADD_KUDU_TEST(parser-test LABELS no_dist_test)
-    if(NOT "${NO_TESTS}")
-      target_link_libraries(oauth-test
-        twitter_demo)
-      target_link_libraries(parser-test
-        twitter_demo)
-      execute_process(COMMAND ln -sf ${CMAKE_CURRENT_SOURCE_DIR}/example-tweets.txt
-        ${EXECUTABLE_OUTPUT_PATH})
-      execute_process(COMMAND ln -sf ${CMAKE_CURRENT_SOURCE_DIR}/example-deletes.txt
-        ${EXECUTABLE_OUTPUT_PATH})
-    endif()
-
+    target_link_libraries(oauth-test
+      twitter_demo)
+    target_link_libraries(parser-test
+      twitter_demo)
+    execute_process(COMMAND ln -sf ${CMAKE_CURRENT_SOURCE_DIR}/example-tweets.txt
+      ${EXECUTABLE_OUTPUT_PATH})
+    execute_process(COMMAND ln -sf ${CMAKE_CURRENT_SOURCE_DIR}/example-deletes.txt
+      ${EXECUTABLE_OUTPUT_PATH})
   endif() # if(NOT LIBOAUTH_LIBRARY) ... else ...
 endif() # if (NOT PKG_CONFIG_FOUND) ... else ...


Mime
View raw message