Skip to content

Commit

Permalink
IMPALA-11716: Bump up gcovr version to 4.2
Browse files Browse the repository at this point in the history
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 <michael.smith@cloudera.com>
Tested-by: Impala Public Jenkins <impala-public-jenkins@cloudera.com>
  • Loading branch information
stiga-huang authored and Impala Public Jenkins committed Nov 11, 2022
1 parent f617e36 commit 45ea094
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 4 deletions.
2 changes: 1 addition & 1 deletion bin/bootstrap_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions bin/bootstrap_system.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions bin/coverage_helper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
5 changes: 4 additions & 1 deletion infra/python/deps/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 45ea094

Please sign in to comment.