From patchwork Sun May 23 17:00:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1482504 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=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=OmGKd2Ra; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4Fp67c5pF8z9sRN for ; Mon, 24 May 2021 03:01:28 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4F10682B48; Sun, 23 May 2021 19:01:10 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="OmGKd2Ra"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E6CF282D6E; Sun, 23 May 2021 19:01:08 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qt1-x82f.google.com (mail-qt1-x82f.google.com [IPv6:2607:f8b0:4864:20::82f]) (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 866C082B0E for ; Sun, 23 May 2021 19:01:05 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=seanga2@gmail.com Received: by mail-qt1-x82f.google.com with SMTP id t20so19040924qtx.8 for ; Sun, 23 May 2021 10:01:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=THwhg3K2McFQMrhhdTXoa0Rmso+90vzt6rKIbNiwjew=; b=OmGKd2RaHeuh8TMrNqUs3dwFGmQIb0hP+Y0CqvGFES1NAHzOFoAjFMF8KRtD1oDXcP IRrLpZNF8ogLjVwtGjxY67FqUMIggRSybpDtNDsDTpHAszZt1q8U1Bx1JPBR/5XRpdpe ZqvSem/QelXEybXY0CIJpnl9R1w7s/FRktVlVNByGcHYzw9HrA+rsrSX4EWJ1xXbH6qE AwL5M77dLG8KzDANhWt35AeKoDi78QQrs9sTiAh0Zh92JYfTv2d4kWo8PszN4a7+4cmf cNIb9G5qS7yFddcePeaup2a0ArFypzk7JP+PvUsDY+RdYbEfuYQZMjCqV1ICp4xOhwvg yDnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=THwhg3K2McFQMrhhdTXoa0Rmso+90vzt6rKIbNiwjew=; b=ccBJscKMtUd/AFHJuoq++btagFRlFKKANofujjVAaFJSQp2gy5sgqdS98WDT194Bp+ A/WL7wUWXM2xlChEB3pfhrdYHCWa3RLo2pFJz2Zj0HGBiRTDgm3Py0cs5blyMx58R4sG +b4oGOj5Vn6IsAzcGKQLcoMhqzQT3fB8R3Ns/+fFSNbnYg9qFBflSK1p9D7ZFInSEKHt AG+be4dXM1NeuzUQVsSQm1rKcmYu7FesoC8U7SXzGshvvlU6Z3mBbp+RD2HHNMOeOaNp H7aWA3xC0Jk0pmkr3FR1HhFhcNRnrAllqS9jATXDc+oSzI9YxvXWpNPsUhn+myt8YY6D XBRg== X-Gm-Message-State: AOAM533pCtZexErcWZSksmMOiMcJdBh4vwMNO9y+i+HK6eUl6pI3dgIS sSzPqUpmvdDwKaxRU4+gfVZ5QV/XAMY= X-Google-Smtp-Source: ABdhPJwRXocgqmzYzbxtapRTbB6UgbaiysEdtBv65aXeBDfuDdv5dbLHCI5NgFfPyfqzQLb7H9m7nw== X-Received: by 2002:ac8:4750:: with SMTP id k16mr23132670qtp.13.1621789264119; Sun, 23 May 2021 10:01:04 -0700 (PDT) Received: from godwin.fios-router.home (pool-108-51-35-162.washdc.fios.verizon.net. [108.51.35.162]) by smtp.gmail.com with ESMTPSA id b17sm8362742qtb.78.2021.05.23.10.01.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 May 2021 10:01:03 -0700 (PDT) From: Sean Anderson To: u-boot@lists.denx.de, Tom Rini Cc: Simon Glass , Heinrich Schuchardt , Sean Anderson Subject: [PATCH] test: Remove duplicate macro Date: Sun, 23 May 2021 13:00:56 -0400 Message-Id: <20210523170056.3039406-1-seanga2@gmail.com> X-Mailer: git-send-email 2.31.0 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.102.4 at phobos.denx.de X-Virus-Status: Clean ut_asserteq_strn is defined twice. Remove one definition. Fixes: 33d7edfd5f ("test: Add a way to check part of a console line or skip it") Signed-off-by: Sean Anderson Reviewed-by: Heinrich Schuchardt --- include/test/ut.h | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/include/test/ut.h b/include/test/ut.h index fbbba286ee..656e25fe57 100644 --- a/include/test/ut.h +++ b/include/test/ut.h @@ -177,23 +177,6 @@ int ut_check_console_dump(struct unit_test_state *uts, int total_bytes); } \ } -/* - * Assert that two string expressions are equal, up to length of the - * first - */ -#define ut_asserteq_strn(expr1, expr2) { \ - const char *_val1 = (expr1), *_val2 = (expr2); \ - int _len = strlen(_val1); \ - \ - if (memcmp(_val1, _val2, _len)) { \ - ut_failf(uts, __FILE__, __LINE__, __func__, \ - #expr1 " = " #expr2, \ - "Expected \"%.*s\", got \"%.*s\"", \ - _len, _val1, _len, _val2); \ - return CMD_RET_FAILURE; \ - } \ -} - /* Assert that two memory areas are equal */ #define ut_asserteq_mem(expr1, expr2, len) { \ const u8 *_val1 = (u8 *)(expr1), *_val2 = (u8 *)(expr2); \