From: Joe Guo <joeg@catalyst.net.nz>
Date: Fri, 3 May 2019 02:21:24 +0000 (+1200)
Subject: bootstrap: add lcov to generate code coverage report
X-Git-Tag: tdb-1.4.1~215
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=051af0025cc30e56760e6a1cd2a747c01c7131a2;p=thirdparty%2Fsamba.git

bootstrap: add lcov to generate code coverage report

Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bff0e089058..6b08628729e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@ variables:
   # Set this to the contents of bootstrap/sha1sum.txt
   # which is generated by bootstrap/template.py --render
   #
-  SAMBA_CI_CONTAINER_TAG: 4cc4709edd40e4e7c64f9eb255f953eed7924b1f
+  SAMBA_CI_CONTAINER_TAG: 2be76362af215af6842e884abd5246dd9b50c283
   # We use the ubuntu1804 image as default as
   # it matches what we have on sn-devel-184.
   SAMBA_CI_CONTAINER_IMAGE: ubuntu1804
diff --git a/bootstrap/config.py b/bootstrap/config.py
index ac2628530f1..627b7e11397 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -44,6 +44,7 @@ COMMON = [
     'gzip',
     'hostname',
     'htop',
+    'lcov',
     'make',
     'patch',
     'perl',
diff --git a/bootstrap/generated-dists/centos6/bootstrap.sh b/bootstrap/generated-dists/centos6/bootstrap.sh
index fdd04385a02..521d571d1f6 100755
--- a/bootstrap/generated-dists/centos6/bootstrap.sh
+++ b/bootstrap/generated-dists/centos6/bootstrap.sh
@@ -41,6 +41,7 @@ yum -y -q --verbose install \
     keyutils-libs-devel \
     krb5-devel \
     krb5-server \
+    lcov \
     libacl-devel \
     libaio-devel \
     libarchive-devel \
diff --git a/bootstrap/generated-dists/centos6/packages.yml b/bootstrap/generated-dists/centos6/packages.yml
index 307d31826e6..c9aef4d64ee 100644
--- a/bootstrap/generated-dists/centos6/packages.yml
+++ b/bootstrap/generated-dists/centos6/packages.yml
@@ -29,6 +29,7 @@ packages:
   - keyutils-libs-devel
   - krb5-devel
   - krb5-server
+  - lcov
   - libacl-devel
   - libaio-devel
   - libarchive-devel
diff --git a/bootstrap/generated-dists/centos7/bootstrap.sh b/bootstrap/generated-dists/centos7/bootstrap.sh
index 122025df729..fa1e49836f3 100755
--- a/bootstrap/generated-dists/centos7/bootstrap.sh
+++ b/bootstrap/generated-dists/centos7/bootstrap.sh
@@ -41,6 +41,7 @@ yum -y -q --verbose install \
     keyutils-libs-devel \
     krb5-devel \
     krb5-server \
+    lcov \
     libacl-devel \
     libaio-devel \
     libarchive-devel \
diff --git a/bootstrap/generated-dists/centos7/packages.yml b/bootstrap/generated-dists/centos7/packages.yml
index 93aa4db8a11..2dd4fb68265 100644
--- a/bootstrap/generated-dists/centos7/packages.yml
+++ b/bootstrap/generated-dists/centos7/packages.yml
@@ -29,6 +29,7 @@ packages:
   - keyutils-libs-devel
   - krb5-devel
   - krb5-server
+  - lcov
   - libacl-devel
   - libaio-devel
   - libarchive-devel
diff --git a/bootstrap/generated-dists/debian7/bootstrap.sh b/bootstrap/generated-dists/debian7/bootstrap.sh
index ac3ba7f399b..6141efc3a2b 100755
--- a/bootstrap/generated-dists/debian7/bootstrap.sh
+++ b/bootstrap/generated-dists/debian7/bootstrap.sh
@@ -35,6 +35,7 @@ apt-get -y install \
     krb5-config \
     krb5-kdc \
     krb5-user \
+    lcov \
     libacl1-dev \
     libaio-dev \
     libarchive-dev \
diff --git a/bootstrap/generated-dists/debian7/packages.yml b/bootstrap/generated-dists/debian7/packages.yml
index 0611dd8475c..9cb9b2df5b9 100644
--- a/bootstrap/generated-dists/debian7/packages.yml
+++ b/bootstrap/generated-dists/debian7/packages.yml
@@ -24,6 +24,7 @@ packages:
   - krb5-config
   - krb5-kdc
   - krb5-user
+  - lcov
   - libacl1-dev
   - libaio-dev
   - libarchive-dev
diff --git a/bootstrap/generated-dists/debian8/bootstrap.sh b/bootstrap/generated-dists/debian8/bootstrap.sh
index bddc4548016..0388a1134d4 100755
--- a/bootstrap/generated-dists/debian8/bootstrap.sh
+++ b/bootstrap/generated-dists/debian8/bootstrap.sh
@@ -35,6 +35,7 @@ apt-get -y install \
     krb5-config \
     krb5-kdc \
     krb5-user \
+    lcov \
     libacl1-dev \
     libaio-dev \
     libarchive-dev \
diff --git a/bootstrap/generated-dists/debian8/packages.yml b/bootstrap/generated-dists/debian8/packages.yml
index e0e5d53d5ea..f7e9ec61fe3 100644
--- a/bootstrap/generated-dists/debian8/packages.yml
+++ b/bootstrap/generated-dists/debian8/packages.yml
@@ -24,6 +24,7 @@ packages:
   - krb5-config
   - krb5-kdc
   - krb5-user
+  - lcov
   - libacl1-dev
   - libaio-dev
   - libarchive-dev
diff --git a/bootstrap/generated-dists/debian9/bootstrap.sh b/bootstrap/generated-dists/debian9/bootstrap.sh
index 5e5a2fd43ed..5576c455ce7 100755
--- a/bootstrap/generated-dists/debian9/bootstrap.sh
+++ b/bootstrap/generated-dists/debian9/bootstrap.sh
@@ -35,6 +35,7 @@ apt-get -y install \
     krb5-config \
     krb5-kdc \
     krb5-user \
+    lcov \
     libacl1-dev \
     libaio-dev \
     libarchive-dev \
diff --git a/bootstrap/generated-dists/debian9/packages.yml b/bootstrap/generated-dists/debian9/packages.yml
index 9fdb1d1c2e6..03d9f4759a5 100644
--- a/bootstrap/generated-dists/debian9/packages.yml
+++ b/bootstrap/generated-dists/debian9/packages.yml
@@ -24,6 +24,7 @@ packages:
   - krb5-config
   - krb5-kdc
   - krb5-user
+  - lcov
   - libacl1-dev
   - libaio-dev
   - libarchive-dev
diff --git a/bootstrap/generated-dists/fedora28/bootstrap.sh b/bootstrap/generated-dists/fedora28/bootstrap.sh
index 274459257ed..e2e4ee99803 100755
--- a/bootstrap/generated-dists/fedora28/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora28/bootstrap.sh
@@ -43,6 +43,7 @@ dnf install -y \
     keyutils-libs-devel \
     krb5-devel \
     krb5-server \
+    lcov \
     libacl-devel \
     libaio-devel \
     libarchive-devel \
diff --git a/bootstrap/generated-dists/fedora28/packages.yml b/bootstrap/generated-dists/fedora28/packages.yml
index 8c81c565351..e20a8764a6b 100644
--- a/bootstrap/generated-dists/fedora28/packages.yml
+++ b/bootstrap/generated-dists/fedora28/packages.yml
@@ -32,6 +32,7 @@ packages:
   - keyutils-libs-devel
   - krb5-devel
   - krb5-server
+  - lcov
   - libacl-devel
   - libaio-devel
   - libarchive-devel
diff --git a/bootstrap/generated-dists/fedora29/bootstrap.sh b/bootstrap/generated-dists/fedora29/bootstrap.sh
index 274459257ed..e2e4ee99803 100755
--- a/bootstrap/generated-dists/fedora29/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora29/bootstrap.sh
@@ -43,6 +43,7 @@ dnf install -y \
     keyutils-libs-devel \
     krb5-devel \
     krb5-server \
+    lcov \
     libacl-devel \
     libaio-devel \
     libarchive-devel \
diff --git a/bootstrap/generated-dists/fedora29/packages.yml b/bootstrap/generated-dists/fedora29/packages.yml
index 8c81c565351..e20a8764a6b 100644
--- a/bootstrap/generated-dists/fedora29/packages.yml
+++ b/bootstrap/generated-dists/fedora29/packages.yml
@@ -32,6 +32,7 @@ packages:
   - keyutils-libs-devel
   - krb5-devel
   - krb5-server
+  - lcov
   - libacl-devel
   - libaio-devel
   - libarchive-devel
diff --git a/bootstrap/generated-dists/opensuse150/bootstrap.sh b/bootstrap/generated-dists/opensuse150/bootstrap.sh
index 4f42c526375..41506f9c67e 100755
--- a/bootstrap/generated-dists/opensuse150/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse150/bootstrap.sh
@@ -40,6 +40,7 @@ zypper --non-interactive install \
     keyutils-devel \
     krb5-devel \
     krb5-server \
+    lcov \
     libacl-devel \
     libaio-devel \
     libarchive-devel \
diff --git a/bootstrap/generated-dists/opensuse150/packages.yml b/bootstrap/generated-dists/opensuse150/packages.yml
index ddf8cdb7ba6..66c59e4ee2a 100644
--- a/bootstrap/generated-dists/opensuse150/packages.yml
+++ b/bootstrap/generated-dists/opensuse150/packages.yml
@@ -28,6 +28,7 @@ packages:
   - keyutils-devel
   - krb5-devel
   - krb5-server
+  - lcov
   - libacl-devel
   - libaio-devel
   - libarchive-devel
diff --git a/bootstrap/generated-dists/ubuntu1404/bootstrap.sh b/bootstrap/generated-dists/ubuntu1404/bootstrap.sh
index c4e2da48220..b391f6ae225 100755
--- a/bootstrap/generated-dists/ubuntu1404/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1404/bootstrap.sh
@@ -35,6 +35,7 @@ apt-get -y install \
     krb5-kdc \
     krb5-user \
     language-pack-en \
+    lcov \
     libacl1-dev \
     libaio-dev \
     libarchive-dev \
diff --git a/bootstrap/generated-dists/ubuntu1404/packages.yml b/bootstrap/generated-dists/ubuntu1404/packages.yml
index 854dfd863fb..1a69db83823 100644
--- a/bootstrap/generated-dists/ubuntu1404/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1404/packages.yml
@@ -24,6 +24,7 @@ packages:
   - krb5-kdc
   - krb5-user
   - language-pack-en
+  - lcov
   - libacl1-dev
   - libaio-dev
   - libarchive-dev
diff --git a/bootstrap/generated-dists/ubuntu1604/bootstrap.sh b/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
index 356c59c808e..71d284a3d54 100755
--- a/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
@@ -35,6 +35,7 @@ apt-get -y install \
     krb5-kdc \
     krb5-user \
     language-pack-en \
+    lcov \
     libacl1-dev \
     libaio-dev \
     libarchive-dev \
diff --git a/bootstrap/generated-dists/ubuntu1604/packages.yml b/bootstrap/generated-dists/ubuntu1604/packages.yml
index b06d7efe985..2b0011c2c1f 100644
--- a/bootstrap/generated-dists/ubuntu1604/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1604/packages.yml
@@ -24,6 +24,7 @@ packages:
   - krb5-kdc
   - krb5-user
   - language-pack-en
+  - lcov
   - libacl1-dev
   - libaio-dev
   - libarchive-dev
diff --git a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
index 7a5dc23e62e..b019db6db7a 100755
--- a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
@@ -36,6 +36,7 @@ apt-get -y install \
     krb5-kdc \
     krb5-user \
     language-pack-en \
+    lcov \
     libacl1-dev \
     libaio-dev \
     libarchive-dev \
diff --git a/bootstrap/generated-dists/ubuntu1804/packages.yml b/bootstrap/generated-dists/ubuntu1804/packages.yml
index bbf8eb59640..7d02be88ff7 100644
--- a/bootstrap/generated-dists/ubuntu1804/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1804/packages.yml
@@ -25,6 +25,7 @@ packages:
   - krb5-kdc
   - krb5-user
   - language-pack-en
+  - lcov
   - libacl1-dev
   - libaio-dev
   - libarchive-dev
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index dca78add500..f4e6322c5b6 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-4cc4709edd40e4e7c64f9eb255f953eed7924b1f
+2be76362af215af6842e884abd5246dd9b50c283