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 EA6D2C433EF for ; Mon, 10 Jan 2022 03:15:24 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 540FA81E38; Mon, 10 Jan 2022 04:15:18 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="Rtt1DtUo"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 02D37811DF; Mon, 10 Jan 2022 04:15:13 +0100 (CET) Received: from mail-il1-x12f.google.com (mail-il1-x12f.google.com [IPv6:2607:f8b0:4864:20::12f]) (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 C13F681221 for ; Mon, 10 Jan 2022 04:15:09 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12f.google.com with SMTP id y18so935428iln.3 for ; Sun, 09 Jan 2022 19:15:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wKuvV+JTlt6vp9z29NXJ9gw/fuens1zGMiBiDEGXNx8=; b=Rtt1DtUoMx0gVJSnY1lQ3urpuc1p0JVtY5b+kkgnoMlS7ZQzw2cVaOiHODhf8gXMtW 9d0oT9rkf29UCwc7RmjauBCRb8d9w5kMfOFYx1Z2uCdTt8MhxL22YGUBsQCAqWnJrnGN 1Lgi8Ro7/sFcwTkGObed4PBQm+oTtB1yTsrpY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wKuvV+JTlt6vp9z29NXJ9gw/fuens1zGMiBiDEGXNx8=; b=Rno72tx9dHN7ScsIOlAHFutO+EPkLXLp4D5nUyoxE58C8N35cOyFpGx77WF5DH5vvv kxohuSZBhPfk1hTIGF7URCtAznoveIs19DOVwLMwdJxHqs4KoM87f0KMk5exLixhuv9P S07KVIFAruS/C2sLGIm3m8s5sas5yNW98HEKELdsNMN/wwy7kWiEjx5apDfxMM3w93pS EMFM4XnUMgp7mUODZBKP3iH60Df1RwE8aGhIfh7wGDg3YTsCAgMo2jw8+3tW61B77Gg8 idyoMSfGJUL6osZqZJKuTKWB3O5MbUqNOyPFeAlTGI5oMO2DEC1P7TRp93pNqEzWNtGg VEjQ== X-Gm-Message-State: AOAM531PCtsgyhW8NKvCxa3t9XtjL48kOhTMKwae+YMZ9nyOIxzbNLHg i0Q/6XRlvvQ8yct8oEtA7Sl4vNBHudMV8w== X-Google-Smtp-Source: ABdhPJwpz8Km15bYDrbek9yybVRBz0Ntv3jYZMxJcRrL7tKYhGy1kf6mJo9Tz1m1nWEkqyDi+9UbHQ== X-Received: by 2002:a92:c202:: with SMTP id j2mr32195209ilo.165.1641784508434; Sun, 09 Jan 2022 19:15:08 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id d16sm3542182ioy.29.2022.01.09.19.15.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Jan 2022 19:15:08 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Simon Glass Subject: [PATCH v2 02/38] binman: Tweak elf tests for a toolchain change Date: Sun, 9 Jan 2022 20:13:37 -0700 Message-Id: <20220110031413.1970836-3-sjg@chromium.org> X-Mailer: git-send-email 2.34.1.575.g55b058a8bb-goog In-Reply-To: <20220110031413.1970836-1-sjg@chromium.org> References: <20220110031413.1970836-1-sjg@chromium.org> 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.2 at phobos.denx.de X-Virus-Status: Clean Some newer toolchains do not create a symbol for the .ucode section that this test relies on. Update the test to use the symbol that is explicitly created, instead. Signed-off-by: Simon Glass --- (no changes since v1) tools/binman/elf_test.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/binman/elf_test.py b/tools/binman/elf_test.py index ac69a95b654..f7272584878 100644 --- a/tools/binman/elf_test.py +++ b/tools/binman/elf_test.py @@ -99,17 +99,17 @@ class TestElf(unittest.TestCase): """Test that we can obtain a symbol from the ELF file""" fname = self.ElfTestFile('u_boot_ucode_ptr') syms = elf.GetSymbols(fname, []) - self.assertIn('.ucode', syms) + self.assertIn('_dt_ucode_base_size', syms) def testRegexSymbols(self): """Test that we can obtain from the ELF file by regular expression""" fname = self.ElfTestFile('u_boot_ucode_ptr') syms = elf.GetSymbols(fname, ['ucode']) - self.assertIn('.ucode', syms) + self.assertIn('_dt_ucode_base_size', syms) syms = elf.GetSymbols(fname, ['missing']) - self.assertNotIn('.ucode', syms) + self.assertNotIn('_dt_ucode_base_size', syms) syms = elf.GetSymbols(fname, ['missing', 'ucode']) - self.assertIn('.ucode', syms) + self.assertIn('_dt_ucode_base_size', syms) def testMissingFile(self): """Test that a missing file is detected""" -- 2.34.1.575.g55b058a8bb-goog