[impala] branch master updated: IMPALA-10226: Change buildall.sh -notests to invoke a single Make target

[jo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

joemcdonnell pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git


The following commit(s) were added to refs/heads/master by this push:
     new e76010d  IMPALA-10226: Change buildall.sh -notests to invoke a single Make target
e76010d is described below

commit e76010d62889aaa2b04f6cfea9bb74b829877eb9
Author: Joe McDonnell <jo...@cloudera.com>
AuthorDate: Thu Oct 15 14:51:52 2020 -0700

    IMPALA-10226: Change buildall.sh -notests to invoke a single Make target
    
    This is a small cleanup to add specific targets in CMake for
    buildall.sh -notests to invoke. Previously, it ran multiple
    targets like:
    make target1 target2 target3 ...
    In hand tests, make builds each target separately, so it is
    unable to overlap the builds of the multiple targets. Pushing
    it into CMake simplifies the code and allows the targets to
    build simultaneously.
    
    Testing:
     - Ran buildall.sh -notests
    
    Change-Id: Id881d6f481b32ba82501b16bada14b6630ba32d2
    Reviewed-on: http://gerrit.cloudera.org:8080/16605
    Reviewed-by: Tim Armstrong <ta...@cloudera.com>
    Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
 CMakeLists.txt | 11 +++++++++++
 buildall.sh    |  7 +++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ddfc26b..875cfb1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -448,6 +448,17 @@ add_custom_target(cscope ALL DEPENDS gen-deps
   COMMAND "${CMAKE_SOURCE_DIR}/bin/gen-cscope.sh"
 )
 
+add_custom_target(notests_independent_targets DEPENDS
+  java cscope tarballs
+)
+add_custom_target(notests_regular_targets DEPENDS
+  impalad statestored catalogd fesupport loggingsupport ImpalaUdf udasample udfsample
+)
+
+add_custom_target(notests_all_targets DEPENDS
+  notests_independent_targets notests_regular_targets
+)
+
 # Dump include paths to a file
 if (DUMP_INCLUDE_PATHS)
   file(REMOVE "${DUMP_INCLUDE_PATHS}")
diff --git a/buildall.sh b/buildall.sh
index 2a7eade..29fd0fd 100755
--- a/buildall.sh
+++ b/buildall.sh
@@ -445,11 +445,10 @@ build_all_components() {
   # If we skip specifying targets, everything we need gets built.
   local MAKE_TARGETS=""
   if [[ $BUILD_TESTS -eq 0 ]]; then
-    # Specify all the non-test targets
-    MAKE_TARGETS="impalad statestored catalogd fesupport loggingsupport ImpalaUdf \
-        udasample udfsample"
     if (( build_independent_targets )); then
-      MAKE_TARGETS+=" cscope java tarballs"
+      MAKE_TARGETS="notests_all_targets"
+    else
+      MAKE_TARGETS="notests_regular_targets"
     fi
   fi
   ${MAKE_CMD} -j${IMPALA_BUILD_THREADS:-4} ${IMPALA_MAKE_FLAGS} ${MAKE_TARGETS}