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 bff0e089058335f92a2de32b8bb046d37e015fd5..6b08628729ed3ca381c7170a6a09d4e1e3ef860b 100644 (file)
--- 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 ac2628530f16cef423bd4660d8fb61abae3788bf..627b7e11397a154766eb86066ea12c6409d5d601 100644 (file)
--- 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 fdd04385a02a79b2dce0e103c1189b28f24fdb9a..521d571d1f6978a87b646051a96b1b09fb6c7b89 100755 (executable)
--- 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 307d31826e6c094cfdc8a93735fa651138d0a08d..c9aef4d64ee3b49e07d46679c91d251a9f1807fa 100644 (file)
--- 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 122025df729a75af2ca6e62ce5901f1bbc5603ca..fa1e49836f3b3cef54e850c44f85586008f31680 100755 (executable)
--- 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 93aa4db8a1100da83196b1add153e109c16f7fc7..2dd4fb682657291febee9465e0c42385b6052be1 100644 (file)
--- 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 ac3ba7f399bd4b3a446299c334810de7e3de7e26..6141efc3a2b548c717619c7a5b821a5ab39a6e54 100755 (executable)
--- 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 0611dd8475c0169da71c95a30ec22750978d327a..9cb9b2df5b906a2f4503375e33dcdfdeeb566563 100644 (file)
--- 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 bddc4548016d9c027705715adc1ec059b12399be..0388a1134d4bf3b4e866f589efc646c019b88794 100755 (executable)
--- 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 e0e5d53d5ea3a079dc88c43606b626ba2db8e631..f7e9ec61fe30366606f55e560574cbccd2853852 100644 (file)
--- 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 5e5a2fd43ed2b5ba20296717449362199e6f0752..5576c455ce75e27476c5780b4d3d7336260bcd46 100755 (executable)
--- 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 9fdb1d1c2e68dd52d723fc063c48ea22960c35d5..03d9f4759a55e01a97bead2690fdcbfed6c2a816 100644 (file)
--- 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 274459257eda52c297636e3ebb1e7b0dc5824d7b..e2e4ee99803246c0015a2443fc8a10c5b44995ca 100755 (executable)
--- 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 8c81c565351aa4a96aed0b021b1a53a5d5274331..e20a8764a6bd2ec472eaab6059af869f1160e64a 100644 (file)
--- 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 274459257eda52c297636e3ebb1e7b0dc5824d7b..e2e4ee99803246c0015a2443fc8a10c5b44995ca 100755 (executable)
--- 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 8c81c565351aa4a96aed0b021b1a53a5d5274331..e20a8764a6bd2ec472eaab6059af869f1160e64a 100644 (file)
--- 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 4f42c52637575dedf1927baa83367da788e02e00..41506f9c67e8cfbf9ed85c58e9b7d52223659cc9 100755 (executable)
--- 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 ddf8cdb7ba644666b5c4afd2a82e20be0823fd2d..66c59e4ee2a04b81ce8762da4b776d66c09750c3 100644 (file)
--- 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 c4e2da482206733fc607f2e1f483c9c99d219554..b391f6ae225bf83c23c9dd8105cd389877a15145 100755 (executable)
--- 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 854dfd863fb2bd3cb39f445d27b8610252082570..1a69db83823356e8fa1b2f6442674e5975e1f3fc 100644 (file)
--- 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 356c59c808e5f2cf69d297d8be4da5c87da363b3..71d284a3d545e72214c21498b7c0c8f51931d49f 100755 (executable)
--- 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 b06d7efe985ae386301936db7393381a0e0e5697..2b0011c2c1f2eb507c151bd0298f9fb5d3593c5d 100644 (file)
--- 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 7a5dc23e62e0b49697bc7f31fea612fe2bc140aa..b019db6db7a71ca8ef462feb5b747773ff04897c 100755 (executable)
--- 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 bbf8eb5964095cd4cb25d432de02f90dc8340d8f..7d02be88ff748d719943c79bf849b9414000121e 100644 (file)
--- 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 dca78add5006326d1d2e3e31977d747b20984403..f4e6322c5b67b056d0b1a3916dcb166a6e9dc1fa 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-4cc4709edd40e4e7c64f9eb255f953eed7924b1f
+2be76362af215af6842e884abd5246dd9b50c283