| Message ID | 20220311121248.2801589-1-trini@konsulko.com |
|---|---|
| State | Accepted |
| Commit | 576eac8557a9f0f5e601213659350a58cd4c270a |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [1/4] CI: Fix unmigrated symbol test | expand |
On Fri, Mar 11, 2022 at 07:12:45AM -0500, Tom Rini wrote: > 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> Applied to u-boot/next, thanks!
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 8352b10348de..81a72e03aa88 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 1f4be626adab..3f39e5588ba4 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";
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> --- .azure-pipelines.yml | 2 +- .gitlab-ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)