(impala) 02/04: IMPALA-12762: Fix cmake error in package building

[st...@apache.org]

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

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

commit 18a77cd3bcafa7d650177ad8b6ad1db8cf21a21d
Author: zhangyifan27 <ch...@163.com>
AuthorDate: Mon Jan 29 17:44:20 2024 +0800

    IMPALA-12762: Fix cmake error in package building
    
    This patch adds extra processing of option 'BUILD_WITH_NO_TESTS' in
    be/src/exec/json/CMakeLists.txt, so test targets will not be generated
    by the CMake when building Impala with -package and -notests.
    
    Testing:
      - Run './buildall.sh -noclean -notests -package' with no error
    
    Change-Id: Ice0cbb0671d915f997fa74217521a82be164ae57
    Reviewed-on: http://gerrit.cloudera.org:8080/20965
    Reviewed-by: Impala Public Jenkins <im...@cloudera.com>
    Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
 be/src/exec/json/CMakeLists.txt            | 4 ++++
 bin/jenkins/build-all-flag-combinations.sh | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/be/src/exec/json/CMakeLists.txt b/be/src/exec/json/CMakeLists.txt
index e654ad9f4..5ad000c5a 100644
--- a/be/src/exec/json/CMakeLists.txt
+++ b/be/src/exec/json/CMakeLists.txt
@@ -28,6 +28,10 @@ add_library(ExecJson
 
 add_dependencies(ExecJson gen-deps)
 
+if (BUILD_WITH_NO_TESTS)
+  return()
+endif()
+
 add_library(ExecJsonTests STATIC
   json-parser-test.cc
 )
diff --git a/bin/jenkins/build-all-flag-combinations.sh b/bin/jenkins/build-all-flag-combinations.sh
index e54ab396b..1143f706b 100755
--- a/bin/jenkins/build-all-flag-combinations.sh
+++ b/bin/jenkins/build-all-flag-combinations.sh
@@ -39,7 +39,7 @@ CONFIGS=(
   # Test gcc builds with and without -so:
   "-skiptests -noclean"
   "-skiptests -noclean -release"
-  "-skiptests -noclean -release -package"
+  "-notests -noclean -release -package"
   "-skiptests -noclean -release -so -ninja"
   # clang sanitizer builds:
   "-skiptests -noclean -asan"
@@ -47,7 +47,7 @@ CONFIGS=(
   "-skiptests -noclean -ubsan -so -ninja"
   # USE_APACHE_HIVE=true build:
   "-skiptests -noclean -use_apache_hive"
-  "-skiptests -noclean -use_apache_hive -package"
+  "-notests -noclean -use_apache_hive -package"
 )
 
 FAILED=""