diff options
| author | Tom Rini <trini@konsulko.com> | 2022-03-11 15:12:45 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-03-18 15:43:24 +0300 |
| commit | 576eac8557a9f0f5e601213659350a58cd4c270a (patch) | |
| tree | 4aa05c72890ac4caa460604fbdb9aaf7c633e214 | |
| parent | 297e6eb8dcf9d90aaf9b0d146cdd502403003d04 (diff) | |
| download | u-boot-576eac8557a9f0f5e601213659350a58cd4c270a.tar.xz | |
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>
| -rw-r--r-- | .azure-pipelines.yml | 2 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index cf49161c6f..0f1a1bd863 100644 --- 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 31f50968a3..388e666ec9 100644 --- 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"; |