From patchwork Fri Mar 11 12:12:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1604339 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KFPwX0xl5z9sGD for ; Fri, 11 Mar 2022 23:13:32 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 713F583AED; Fri, 11 Mar 2022 13:13:11 +0100 (CET) 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 D98B083A2B; Fri, 11 Mar 2022 13:13:01 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.2 Received: from mail-qv1-f53.google.com (mail-qv1-f53.google.com [209.85.219.53]) (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 9A69583AEF for ; Fri, 11 Mar 2022 13:12:54 +0100 (CET) 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-qv1-f53.google.com with SMTP id kl20so6777595qvb.10 for ; Fri, 11 Mar 2022 04:12:54 -0800 (PST) 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=59nywhJ4xFvY1xHIB2k75eHjRHwNqdeFQp39Fqn0eak=; b=irQr0qbvCj/1mEKaytgEeN6mNcdHRvN48HICPOBUsX4ztajA5o0TI+RMJ6mNPGauE5 nhJlSHJYgktopb2C+gKr4klOCblXpAYPNkmx3RyXTtF/PXLXRU2ZhD745k38u93wXhu4 aD0wwdZSo6oqcNXxhR7E1mSYusVJj2rEduCqYk7Csc+gpkudD0xmKJuVq/SMeaqKIgPl HB0jHyv6ZShL1iheeJYF82Bp+pbQh8D0erd8mGk+Gx4zorJ2+OoIkjbhgxTJcbExeOcj fJNQ7cfMx1ntM2uxpbAIIvm4IZN0f+FeygqxMYlVjF4tuTu41izVamMjGSk+Djzv89H7 mWag== X-Gm-Message-State: AOAM533kX2D3nuAJlYSjONGGpd+VcJqMZtjtqOxtYgBVGtm98llCFg3R do6YkCprJF+z/H+dfK4Onf5LUwqZsA== X-Google-Smtp-Source: ABdhPJx1/pIqwVGn9cHaip64DsvQGHnpvD4/luWHQ7w3Tx2rQd8nQEdZVXGnET8BDER0TAcldPkktQ== X-Received: by 2002:ad4:5bad:0:b0:435:6391:943e with SMTP id 13-20020ad45bad000000b004356391943emr7304916qvq.117.1647000772994; Fri, 11 Mar 2022 04:12:52 -0800 (PST) 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 145-20020a370897000000b0067b30c65415sm3809539qki.75.2022.03.11.04.12.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Mar 2022 04:12:52 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 1/4] CI: Fix unmigrated symbol test Date: Fri, 11 Mar 2022 07:12:45 -0500 Message-Id: <20220311121248.2801589-1-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 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 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 --- .azure-pipelines.yml | 2 +- .gitlab-ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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";