gnu: merge the root tests results into the main one

.github/workflows/GnuTests.yml

@@ -34,6 +34,7 @@ jobs:
         outputs repo_default_branch repo_GNU_ref repo_reference_branch
         #
         SUITE_LOG_FILE="${path_GNU_tests}/test-suite.log"
+        ROOT_SUITE_LOG_FILE="${path_GNU_tests}/test-suite-root.log"
         TEST_LOGS_GLOB="${path_GNU_tests}/**/*.log" ## note: not usable at bash CLI; [why] double globstar not enabled by default b/c MacOS includes only bash v3 which doesn't have double globstar support
         TEST_FILESET_PREFIX='test-fileset-IDs.sha1#'
         TEST_FILESET_SUFFIX='.txt'
@@ -108,18 +109,17 @@ jobs:
       id: summary
       shell: bash
       run: |
+        path_UUTILS='${{ steps.vars.outputs.path_UUTILS }}'
         ## Extract/summarize testing info
         outputs() { step_id="summary"; for var in "$@" ; do echo steps.${step_id}.outputs.${var}="${!var}"; echo ::set-output name=${var}::${!var}; done; }
         #
         SUITE_LOG_FILE='${{ steps.vars.outputs.SUITE_LOG_FILE }}'
+        ROOT_SUITE_LOG_FILE='${{ steps.vars.outputs.ROOT_SUITE_LOG_FILE }}'
+        ls -al ${SUITE_LOG_FILE} ${ROOT_SUITE_LOG_FILE}
+
         if test -f "${SUITE_LOG_FILE}"
         then
-            TOTAL=$(sed -n "s/.*# TOTAL: \(.*\)/\1/p" "${SUITE_LOG_FILE}" | tr -d '\r' | head -n1)
-            PASS=$(sed -n "s/.*# PASS: \(.*\)/\1/p" "${SUITE_LOG_FILE}" | tr -d '\r' | head -n1)
-            SKIP=$(sed -n "s/.*# SKIP: \(.*\)/\1/p" "${SUITE_LOG_FILE}" | tr -d '\r' | head -n1)
-            FAIL=$(sed -n "s/.*# FAIL: \(.*\)/\1/p" "${SUITE_LOG_FILE}" | tr -d '\r' | head -n1)
-            XPASS=$(sed -n "s/.*# XPASS: \(.*\)/\1/p" "${SUITE_LOG_FILE}" | tr -d '\r' | head -n1)
-            ERROR=$(sed -n "s/.*# ERROR: \(.*\)/\1/p" "${SUITE_LOG_FILE}" | tr -d '\r' | head -n1)
+            source ${path_UUTILS}/util/analyze-gnu-results.sh ${SUITE_LOG_FILE} ${ROOT_SUITE_LOG_FILE}
             if [[ "$TOTAL" -eq 0 || "$TOTAL" -eq 1 ]]; then
               echo "::error ::Failed to parse test results from '${SUITE_LOG_FILE}'; failing early"
               exit 1

util/analyze-gnu-results.sh

@@ -0,0 +1,75 @@
+#!/bin/sh
+# spell-checker:ignore xpass XPASS testsuite
+set -e
+
+# As we do two builds (with and without root), we need to do some trivial maths
+# to present the merge results
+# this script will export the values in the term
+
+if test $# -ne 2; then
+    echo "syntax:"
+    echo "$0 testsuite.log root-testsuite.log"
+fi
+
+SUITE_LOG_FILE=$1
+ROOT_SUITE_LOG_FILE=$2
+
+if test ! -f "${SUITE_LOG_FILE}"; then
+    echo "${SUITE_LOG_FILE} has not been found"
+    exit 1
+fi
+if test ! -f "${ROOT_SUITE_LOG_FILE}"; then
+    echo "${ROOT_SUITE_LOG_FILE} has not been found"
+    exit 1
+fi
+
+function get_total {
+    # Total of tests executed
+    # They are the normal number of tests as they are skipped in the normal run
+    NON_ROOT=$(sed -n "s/.*# TOTAL: \(.*\)/\1/p" "${SUITE_LOG_FILE}" | tr -d '\r' | head -n1)
+    echo $NON_ROOT
+}
+
+function get_pass {
+    # This is the sum of the two test suites.
+    # In the normal run, they are SKIP
+    NON_ROOT=$(sed -n "s/.*# PASS: \(.*\)/\1/p" "${SUITE_LOG_FILE}" | tr -d '\r' | head -n1)
+    AS_ROOT=$(sed -n "s/.*# PASS: \(.*\)/\1/p" "${ROOT_SUITE_LOG_FILE}" | tr -d '\r' | head -n1)
+    echo $((NON_ROOT + AS_ROOT))
+}
+
+function get_skip {
+    # As some of the tests executed as root as still SKIP (ex: selinux), we
+    # need to some maths:
+    # Number of tests skip as user - total test as root + skipped as root
+    TOTAL_AS_ROOT=$(sed -n "s/.*# TOTAL: \(.*\)/\1/p" "${ROOT_SUITE_LOG_FILE}" | tr -d '\r' | head -n1)
+    NON_ROOT=$(sed -n "s/.*# SKIP: \(.*\)/\1/p" "${SUITE_LOG_FILE}" | tr -d '\r' | head -n1)
+    AS_ROOT=$(sed -n "s/.*# SKIP: \(.*\)/\1/p" "${ROOT_SUITE_LOG_FILE}" | tr -d '\r' | head -n1)
+    echo $((NON_ROOT - TOTAL_AS_ROOT + AS_ROOT))
+}
+
+function get_fail {
+    # They used to be SKIP, now they fail (this is a good news)
+    NON_ROOT=$(sed -n "s/.*# FAIL: \(.*\)/\1/p" "${SUITE_LOG_FILE}" | tr -d '\r' | head -n1)
+    AS_ROOT=$(sed -n "s/.*# FAIL: \(.*\)/\1/p" "${ROOT_SUITE_LOG_FILE}" | tr -d '\r' | head -n1)
+    echo $((NON_ROOT + AS_ROOT))
+}
+
+function get_xpass {
+    NON_ROOT=$(sed -n "s/.*# XPASS: \(.*\)/\1/p" "${SUITE_LOG_FILE}" | tr -d '\r' | head -n1)
+    echo $NON_ROOT
+}
+
+function get_error {
+    # They used to be SKIP, now they error (this is a good news)
+    NON_ROOT=$(sed -n "s/.*# ERROR: \(.*\)/\1/p" "${SUITE_LOG_FILE}" | tr -d '\r' | head -n1)
+    AS_ROOT=$(sed -n "s/.*# ERROR:: \(.*\)/\1/p" "${ROOT_SUITE_LOG_FILE}" | tr -d '\r' | head -n1)
+    echo $((NON_ROOT + AS_ROOT))
+}
+
+export TOTAL=$(get_total)
+export PASS=$(get_pass)
+export SKIP=$(get_skip)
+export FAIL=$(get_fail)
+export XPASS=$(get_xpass)
+export ERROR=$(get_error)

util/run-gnu-test.sh

@@ -53,5 +53,6 @@ else
 fi
 
 if test -z "$1" && test -n "$CI"; then
+    echo "Running check-root to run only root tests"
     sudo make -j "$(nproc)" check-root SUBDIRS=. RUN_EXPENSIVE_TESTS=yes RUN_VERY_EXPENSIVE_TESTS=yes VERBOSE=no gl_public_submodule_commit="" srcdir="${path_GNU}" TEST_SUITE_LOG="tests/test-suite-root.log" || :
 fi