have CI call util/check-categories.sh

(cherry picked from commit 2270e28fde11704c09c635ec3edf9631b3f783de)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e9c0727096908e1f715f258fd08a49e4be04c2a8..5eeaea12af8eeba63d5e9f67764ed2729adf536e 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -396,6 +396,7 @@ misc:
     - xmllint --noout --nonet `git ls-files '*.xml' '*.docbook'`
     - xmllint --noout --nonet --html `git ls-files '*.html'`
     - sh util/check-win32util-configure
+    - sh util/check-categories.sh
   needs: []
   artifacts:
     paths:

diff --git a/util/check-categories.sh b/util/check-categories.sh
index dff066796d5d263d8b050df2ca775b442ec7e79e..ab862ce353e3cbec2d245e890c6524a73652714b 100644 (file)
--- a/util/check-categories.sh
+++ b/util/check-categories.sh
@@ -13,6 +13,7 @@ sed -e 's/.*LOGCATEGORY_\([A-Z_]*\).*/\1/' -e 's/^RRL$/rate-limit/' |
 tr '[A-Z]' '[a-z]' |
 tr _ - | sed 's/^tat$/trust-anchor-telemetry/' | sort -u`
 list2=`sed -n 's;.*<para><command>\(.*\)</command></para>;\1;p' doc/arm/logging-categories.xml | tr '[A-Z]' '[a-z]' | sort -u`
+status=0
 for i in $list1
 do
        ok=no
@@ -26,6 +27,7 @@ do
        if test $ok = no
        then
                echo "$i missing from documentation."
+               status=1
        fi
 done
 for i in $list2
@@ -41,5 +43,7 @@ do
        if test $ok = no
        then
                echo "$i not in code."
+               status=1
        fi
 done
+exit $status