[tor-commits] [tor/release-0.4.2] CI: improve output when skipping doxygen

[nickm@xxxxxxxxxxxxxx]

commit f5b94715479e9b7bef5675ab72c8b2e260bcb830
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Aug 12 12:13:56 2020 -0400

    CI: improve output when skipping doxygen
---
 scripts/ci/ci-driver.sh | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index ba4b800c04..6faffd7b40 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -65,12 +65,14 @@ STEM_PATH="${STEM_PATH:-}"
 if [[ "${COLOR_CI}" == "yes" ]]; then
     T_RED=$(tput setaf 1 || true)
     T_GREEN=$(tput setaf 2 || true)
+    T_YELLOW=$(tput setaf 3 || true)
     T_DIM=$(tput dim || true)
     T_BOLD=$(tput bold || true)
     T_RESET=$(tput sgr0 || true)
 else
     T_RED=
     T_GREEN=
+    T_YELLOW=
     T_DIM=
     T_BOLD=
     T_RESET=
@@ -85,6 +87,12 @@ function die()
     echo "${T_BOLD}${T_RED}FATAL ERROR:${T_RESET} $*" 1>&2
     exit 1
 }
+
+function skipping()
+{
+    echo "${T_BOLD}${T_YELLOW}Skipping $*${T_RESET}"
+}
+
 function hooray()
 {
     echo "${T_BOLD}${T_GREEN}$*${T_RESET}"
@@ -363,12 +371,16 @@ fi
 
 FAILED_TESTS=""
 
-if [[ "${DOXYGEN}" = 'yes' && "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then
+if [[ "${DOXYGEN}" = 'yes' ]]; then
     start_section Doxygen
-    if runcmd make doxygen; then
-	hooray "make doxygen has succeeded."
+    if [[ "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then
+        if runcmd make doxygen; then
+	    hooray "make doxygen has succeeded."
+        else
+	    FAILED_TESTS="${FAILED_TESTS} doxygen"
+        fi
     else
-	FAILED_TESTS="${FAILED_TESTS} doxygen"
+        skipping "make doxygen: doxygen is broken for Tor < 0.4.3"
     fi
     end_section Doxygen
 fi



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits