[impala] branch master updated: IMPALA-11716: Bump up gcovr version to 4.2

[mi...@apache.org]

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

michaelsmith 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 45ea094fa IMPALA-11716: Bump up gcovr version to 4.2
45ea094fa is described below

commit 45ea094fa2e3d5486c4c2a11146f87d745893b5c
Author: stiga-huang <hu...@gmail.com>
AuthorDate: Thu Nov 10 11:53:01 2022 +0800

    IMPALA-11716: Bump up gcovr version to 4.2
    
    IMPALA-9999 upgrades to GCC version to 10.4 which generates new gcov
    format that the current gcovr version (3.4) can't parse. This patch
    upgrades gcovr to the latest Python2-compatible version (4.2). Also adds
    Jinja2, MarkupSafe and lxml as the required dependent packages. The
    development packages of libxml2 and libxslt are also added in
    bootstrap_system.sh and bootstrap_build.sh.
    
    This patch also fixes a failure due to the gcov executable not found in
    PATH.
    
    Tests:
     - Verified builds on Ubuntu 16.04 and CentOS 7.9
     - Verified coverage_helper.sh work after this patch
    
    Change-Id: I9458fa0dc97d69f88a4e8a3313dc9440215dfd52
    Reviewed-on: http://gerrit.cloudera.org:8080/19226
    Reviewed-by: Michael Smith <mi...@cloudera.com>
    Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
 bin/bootstrap_build.sh             | 2 +-
 bin/bootstrap_system.sh            | 4 ++--
 bin/coverage_helper.sh             | 4 ++++
 infra/python/deps/requirements.txt | 5 ++++-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/bin/bootstrap_build.sh b/bin/bootstrap_build.sh
index c1b78a92b..cf504d103 100755
--- a/bin/bootstrap_build.sh
+++ b/bin/bootstrap_build.sh
@@ -35,7 +35,7 @@ export DEBIAN_FRONTEND=noninteractive
 sudo -E apt-get update
 sudo -E apt-get --yes install g++ gcc git libsasl2-dev libssl-dev make python-dev \
      python-setuptools python3-dev python3-setuptools libffi-dev libkrb5-dev \
-     krb5-admin-server krb5-kdc krb5-user
+     krb5-admin-server krb5-kdc krb5-user libxml2-dev libxslt-dev
 
 source /etc/lsb-release
 
diff --git a/bin/bootstrap_system.sh b/bin/bootstrap_system.sh
index 45c61c34e..1bf090b97 100755
--- a/bin/bootstrap_system.sh
+++ b/bin/bootstrap_system.sh
@@ -220,7 +220,7 @@ ubuntu apt-get --yes install ccache curl gawk g++ gcc apt-utils git libffi-dev \
         libsasl2-modules libsasl2-modules-gssapi-mit libssl-dev make ninja-build \
         python-dev python-setuptools python3-dev python3-setuptools postgresql \
         ssh wget vim-common psmisc lsof openjdk-8-jdk openjdk-8-source openjdk-8-dbg \
-        net-tools language-pack-en
+        net-tools language-pack-en libxml2-dev libxslt-dev
 # Required by Kudu in the minicluster
 ubuntu20 apt-get --yes install libtinfo5
 ARCH_NAME=$(uname -p)
@@ -268,7 +268,7 @@ redhat sudo yum install -y curl gawk gcc gcc-c++ git krb5-devel krb5-server \
         wget vim-common nscd cmake fuse-devel zlib-devel \
         psmisc lsof openssh-server redhat-lsb java-1.8.0-openjdk-devel \
         java-1.8.0-openjdk-src python3-devel python3-setuptools net-tools \
-        langpacks-en glibc-langpack-en
+        langpacks-en glibc-langpack-en libxml2-devel libxslt-devel
 
 # Enable the Powertools repo for snappy-devel on RedHat 8
 redhat8 sudo yum install -y dnf-plugins-core
diff --git a/bin/coverage_helper.sh b/bin/coverage_helper.sh
index dad149821..383d96e87 100755
--- a/bin/coverage_helper.sh
+++ b/bin/coverage_helper.sh
@@ -66,6 +66,10 @@ fi
 if [ ${REPORT_ACTION} -eq 1 ]; then
   mkdir -p "${REPORT_DIRECTORY}"
   rm -f "${REPORT_DIRECTORY}"/index*.html
+  if ! which gcov > /dev/null; then
+    export PATH="$PATH:$IMPALA_TOOLCHAIN_PACKAGES_HOME/gcc-$IMPALA_GCC_VERSION/bin"
+  fi
+  echo "Using gcov at `which gcov`"
   # src/util/bit-packing.inline.h gets lots of hits, so generating a detailed report
   # for it takes several minutes. Exclude it to keep the execution time down.
   # gcovr excludes are buggy, so on some environments these excludes won't work.
diff --git a/infra/python/deps/requirements.txt b/infra/python/deps/requirements.txt
index f357cbbe7..59be69e9c 100644
--- a/infra/python/deps/requirements.txt
+++ b/infra/python/deps/requirements.txt
@@ -37,7 +37,10 @@ flake8 == 3.9.2
     contextlib2 == 0.6.0
     pathlib2 == 2.3.7.post1
     zipp == 1.2.0
-gcovr == 3.4
+gcovr == 4.2
+  Jinja2 == 2.11.3
+    MarkupSafe == 1.1.1
+  lxml == 4.9.1
 hdfs == 2.0.2
   docopt == 0.6.2
   execnet == 1.4.0