[gjs/master.windows: 16/18] CI: Remove "Total errors found" line from cpplint output
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs/master.windows: 16/18] CI: Remove "Total errors found" line from cpplint output
- Date: Mon, 4 Mar 2019 08:39:13 +0000 (UTC)
commit b1b9f3b98b6879d3f2e4a8c82463354138b3ad00
Author: Philip Chimento <philip chimento gmail com>
Date: Sun Mar 3 14:06:54 2019 -0800
CI: Remove "Total errors found" line from cpplint output
The newly built Docker image must have gotten a newer version of cpplint
which prints a total error count at the end. We need to remove this line
or the error counts will be flagged as a diff in the linter output.
test/test-ci.sh | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/test/test-ci.sh b/test/test-ci.sh
index 3c012e19..bb0436bd 100755
--- a/test/test-ci.sh
+++ b/test/test-ci.sh
@@ -251,14 +251,18 @@ elif [[ $1 == "CPPLINT" && "$log_message" != *'[skip cpplint]'* ]]; then
do_Print_Labels 'C/C++ Linter report '
cpplint --quiet $(find . -name \*.cpp -or -name \*.c -or -name \*.h | sort) 2>&1 | \
- tee "$save_dir"/analysis/current-report.txt | sed -E -e 's/:[0-9]+:/:LINE:/' -e 's/ +/ /g' >
/cwd/current-report.txt
+ tee "$save_dir"/analysis/current-report.txt | \
+ sed -E -e 's/:[0-9]+:/:LINE:/' -e 's/Total errors found: [0-9]+//' -e 's/ +/ /g' \
+ > /cwd/current-report.txt
cat "$save_dir"/analysis/current-report.txt
echo
# Get the code committed at upstream master
do_Get_Upstream_Master "cppLint"
cpplint --quiet $(find . -name \*.cpp -or -name \*.c -or -name \*.h | sort) 2>&1 | \
- tee "$save_dir"/analysis/master-report.txt | sed -E -e 's/:[0-9]+:/:LINE:/' -e 's/ +/ /g' >
/cwd/master-report.txt
+ tee "$save_dir"/analysis/master-report.txt | \
+ sed -E -e 's/:[0-9]+:/:LINE:/' -e 's/Total errors found: [0-9]+//' -e 's/ +/ /g' \
+ > /cwd/master-report.txt
echo
# Compare the report with master and fail if new warnings are found
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]