From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D3D87C433EF for ; Mon, 11 Apr 2022 17:20:13 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 07F7483DB7; Mon, 11 Apr 2022 19:20:11 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id DD16A83B34; Mon, 11 Apr 2022 19:20:08 +0200 (CEST) Received: from mail-qk1-f172.google.com (mail-qk1-f172.google.com [209.85.222.172]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 1F4C08394A for ; Mon, 11 Apr 2022 19:20:06 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qk1-f172.google.com with SMTP id bk12so11200584qkb.7 for ; Mon, 11 Apr 2022 10:20:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=7QNdr6Q9o/CpT2HDrOvQXhcnSV0Y0yqBUHS5QunoxL0=; b=WR6FyAS8XY8ekut/56FnajmxaTr2vnvSWMBexNLoddqzfrlM7gmxAIBUQQms5M568T Y/iIZYZjjoq42aPem9A3lTzWp+0L5J61819rZrJGCGXrEvWMgAwUAOaUsgrJs+2zOm8y zTdR3d5mUNHv3ghKmQio4NUaRCzlie0d6UZxoEgDhzDRQlnago9GqUuu0x5ru5lHd/Ex xprG5XCVM6xzW8gwlNIWJRWNhaf2PH0OtopPdyCZVwM+NhsED8qCOyWlOraWRHFU/XLz d3ycIlxlQDnmDposd7ndJxyn9vW/Sls5YEvnzxA6ZP3GdJZNjLtqBmp+hvfwWwT26yCD i6xA== X-Gm-Message-State: AOAM533zFNZrV2MNnK9tk2vR+oNLNgXr/Qm+bAoI5aTiOmjgqXgdaxb7 AymEAB73MQeupH1NGxkzyaQhX48WSA== X-Google-Smtp-Source: ABdhPJw0T99r3M2+h2ZAIxOha88CqG7ne6nepd6WVg5S012tC0yryD2HXZZf65hvh+Wk95Ep9D52Sw== X-Received: by 2002:a05:620a:199b:b0:67e:ce80:e414 with SMTP id bm27-20020a05620a199b00b0067ece80e414mr291320qkb.209.1649697604190; Mon, 11 Apr 2022 10:20:04 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b01-cbda-2ef0-5dff-fedb-a8ba.res6.spectrum.com. [2603:6081:7b01:cbda:2ef0:5dff:fedb:a8ba]) by smtp.gmail.com with ESMTPSA id p28-20020a05620a15fc00b0069c28de43casm1569252qkm.102.2022.04.11.10.20.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Apr 2022 10:20:03 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH] CI: Print out unmigrated symbols when failing Date: Mon, 11 Apr 2022 13:20:00 -0400 Message-Id: <20220411172000.2352332-1-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean To make addressing the problem of migrated symbols being present in board config header files, update the CI test to them print what symbols are causing it to fail. Also report all failures in the tree, rather than stopping at the first failing file. Signed-off-by: Tom Rini --- .azure-pipelines.yml | 7 +++++-- .gitlab-ci.yml | 9 ++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 314d27718926..ec77c7ab5fcf 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -63,6 +63,7 @@ stages: - script: | KSYMLST=`mktemp` KUSEDLST=`mktemp` + RET=0 cat `find . -name "Kconfig*"` | \ sed -n -e 's/^\s*config *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \ -e 's/^\s*menuconfig *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \ @@ -76,10 +77,12 @@ stages: NUM=`comm -123 --total --output-delimiter=, ${KSYMLST} ${KUSEDLST} | \ cut -d , -f 3` if [[ $NUM -ne 0 ]]; then - echo "Unmigrated symbols found in $CFG" - exit 1 + echo "Unmigrated symbols found in $CFG:" + comm -12 ${KSYMLST} ${KUSEDLST} + RET=1 fi done + exit $RET - job: cppcheck displayName: 'Static code analysis with cppcheck' diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 43fe8c64991c..f193ffd3cbc4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -124,6 +124,7 @@ check for migrated symbols in board header: script: - KSYMLST=`mktemp`; KUSEDLST=`mktemp`; + RET=0; cat `find . -name "Kconfig*"` | sed -n -e 's/^\s*config *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' -e 's/^\s*menuconfig *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' @@ -137,10 +138,12 @@ check for migrated symbols in board header: NUM=`comm -123 --total --output-delimiter=, ${KSYMLST} ${KUSEDLST} | cut -d , -f 3`; if [[ $NUM -ne 0 ]]; then - echo "Unmigrated symbols found in $CFG"; - exit 1; + echo "Unmigrated symbols found in $CFG:"; + comm -12 ${KSYMLST} ${KUSEDLST}; + RET=1; fi; - done + done; + exit $RET # QA jobs for code analytics # static code analysis with cppcheck (we can add --enable=all later) -- 2.25.1