CI: Fix unmigrated symbol test

When calling comm to compare the CONFIG symbols a defconfig uses with
the symbols that have been migrated, we need to suppress all output as
the summary line will have everything we need.  Failure to do this leads
to the test blowing up, but in non-fatal ways.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index cf49161c6f3a9f0a4d4966314a21a2d8fe73f19d..0f1a1bd86326c0e5f51971463309a5be62619d04 100644 (file)
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -71,7 +71,7 @@ stages:
              grep '#define[[:blank:]]CONFIG_' $CFG | \
                 sed -n 's/#define.\(CONFIG_[A-Za-z0-9_]*\).*/\1/p' | \
                 sort -u > ${KUSEDLST} || true
-             NUM=`comm -12 --total --output-delimiter=, ${KSYMLST} ${KUSEDLST} | \
+             NUM=`comm -123 --total --output-delimiter=, ${KSYMLST} ${KUSEDLST} | \
                 cut -d , -f 3`
              if [[ $NUM -ne 0 ]]; then
                 echo "Unmigrated symbols found in $CFG"

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 31f50968a33e916c5208dce9ff235db5c7dcee18..388e666ec9e3070a0a7796058dc0f5380bb0d16c 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -132,7 +132,7 @@ check for migrated symbols in board header:
          grep '#define[[:blank:]]CONFIG_' $CFG |
             sed -n 's/#define.\(CONFIG_[A-Za-z0-9_]*\).*/\1/p' |
             sort -u > ${KUSEDLST} || true;
-         NUM=`comm -12 --total --output-delimiter=, ${KSYMLST} ${KUSEDLST} |
+         NUM=`comm -123 --total --output-delimiter=, ${KSYMLST} ${KUSEDLST} |
             cut -d , -f 3`;
          if [[ $NUM -ne 0 ]]; then
             echo "Unmigrated symbols found in $CFG";