-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3948 from sylvestre/gnu-root
Agregate the root GNU testsuite results
- Loading branch information
Showing
5 changed files
with
116 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters