[gjs: 2/8] CI: Subst out spaces in cpplint output

[Cosimo Cecchi <cosimoc src gnome org>]

commit d953a3af30d9791628121db0db203d58ed16f6f5
Author: Philip Chimento <philip chimento gmail com>
Date:   Sat Jun 9 00:50:06 2018 -0700

    CI: Subst out spaces in cpplint output
    
    Changes in the number of spaces in cpplint's output were causing spurious
    differences in the output.

 test/test-ci.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/test/test-ci.sh b/test/test-ci.sh
index 2138fee1..70bece2d 100755
--- a/test/test-ci.sh
+++ b/test/test-ci.sh
@@ -241,14 +241,14 @@ 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 's/:[0-9]+:/:LINE:/' > /cwd/current-report.txt
+        tee "$save_dir"/analysis/current-report.txt | sed -E -e 's/:[0-9]+:/:LINE:/' -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 's/:[0-9]+:/:LINE:/' > /cwd/master-report.txt
+        tee "$save_dir"/analysis/master-report.txt | sed -E -e 's/:[0-9]+:/:LINE:/' -e 's/  +/ /g' > 
/cwd/master-report.txt
     echo
 
     # Compare the report with master and fail if new warnings are found