From patchwork Tue Aug 1 16:59:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 129389 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2824022vqg; Tue, 1 Aug 2023 10:30:59 -0700 (PDT) X-Google-Smtp-Source: APBJJlHugVx0qi7WtakX6xExDIuaDe6qToj5/3IqXN1xms0TWAiXU/zTGnrg7SMRdhbz5ix+UuWF X-Received: by 2002:a17:90a:a683:b0:268:6339:318 with SMTP id d3-20020a17090aa68300b0026863390318mr12227854pjq.30.1690911058735; Tue, 01 Aug 2023 10:30:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690911058; cv=none; d=google.com; s=arc-20160816; b=miCW0clXJak5wgW3USs1IwErpZuoCcVfCLWMdvFBZmbBlryEyMHGJD6sol3QxvKysw UQ07YsUf8UMBpv8rwZ48sHxhx2tet0YKc5igTeLxXCnr6YZ+X3yoBUigK/yDNWvhK6R6 1sxMibyQGZ41OcMcamnqqYAj8R5kmCOv5eyebgIJWhCPilzgUHM2hKVJ6wEdxUP8BQk2 qsY78AYQMnEcqwJvnE003puZwjHt6fXDpy2fhF03IAeB7Myi08SpHJfPaQhZmjnNPAP7 7O9Frm7YAP+0cqpESB2d32lq8uYFtSIJ5Jd/7v5f5LQZAii/e5BBXEM/k2A74aIKyaTU pFfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=1MuGWihO3VDoB/+i/6B4hIivkWhjpHVF8bWYexShoNo=; fh=iUWgY86t8GxRj/6mYCAOZqumyzPlowzD2auSj4f+vwI=; b=RiiXzypnOtQpp9UEffFFm7ILKYNaji7hPcvDDEhMVMwVsaIQXVyPCLP0fPWfQ1S0h1 VJxlJqXC0RVAYooSkU1G3cuXxGZxDx9Rj7RJHGc/yC4ULac6dAS9vVCWGP9kPqiMeB5p 9f23yJ/jhi8/f7xLg+Tm3dtexa5g4LnfG/LzrScroDZywY5HEf+e2TbpdXknkjP9JFUz +oZ0o5NyXweiGxvnUxAXdtNRA9b/14cENND8qVgTQ4IBrOq0h2fYPO3NVW7lNks7EXdg 98MIyxJHYgXPwVS4Yo2JTyKl376ESz6OLv2MxkE6BmkTjHJxw2A43l+s4HnJMTJjCCjZ QMKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=EsH6l2Yo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o16-20020a17090aac1000b00262ebe643a2si9430894pjq.186.2023.08.01.10.30.41; Tue, 01 Aug 2023 10:30:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=EsH6l2Yo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233676AbjHARAG (ORCPT + 99 others); Tue, 1 Aug 2023 13:00:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44590 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232062AbjHARAF (ORCPT ); Tue, 1 Aug 2023 13:00:05 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 65EF02113; Tue, 1 Aug 2023 10:00:04 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 011AB615AF; Tue, 1 Aug 2023 17:00:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1A4D0C433C8; Tue, 1 Aug 2023 17:00:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690909203; bh=LCetow/ddKgeNm8NjoibO+WWSXNufUWaMsdcWIJJlI4=; h=From:To:Cc:Subject:Date:From; b=EsH6l2Yok85NKiGdQa7T33Zi2EvugN/drmf5pDY/N7CYwcHQJY+guB0Tn+CjGChbY 0wklxtJOK+20gFg4jR4wPuhIFxRGkdMGKbWUXzP0W0e4lxYhFdmMprnF/hM0tiVZ+G KvqxNn2szRepDHIGjPe1tPWZl6lHbsng/y7mYPhWUXOzaVIEUlADqWhBXms2DkmBwG KFlkc7+k3mRZlf4HLu7F63tgRNIsez1Mcg6/z7wYwqhFs9ij7sLS0AxLinnQdDFQk9 i4Vmayp7DNgYIyQNFgrr652eTfzLNKPPMQ/Aj66ZX+D0z5uU7967ofY4EMtqm1elGx oVgsAnuYM6DuQ== Received: (nullmailer pid 1948307 invoked by uid 1000); Tue, 01 Aug 2023 17:00:02 -0000 From: Rob Herring To: Frank Rowand , "Enrico Weigelt, metux IT consult" Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] of: unittest: Fix EXPECT for parse_phandle_with_args_map() test Date: Tue, 1 Aug 2023 10:59:48 -0600 Message-Id: <20230801165948.1948053-1-robh@kernel.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773048754008533162 X-GMAIL-MSGID: 1773048754008533162 Commit 12e17243d8a1 ("of: base: improve error msg in of_phandle_iterator_next()") added printing of the phandle value on error, but failed to update the unittest. Fixes: 12e17243d8a1 ("of: base: improve error msg in of_phandle_iterator_next()") Signed-off-by: Rob Herring --- drivers/of/unittest.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c index e5b0eea8011c..d943bf87c94d 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c @@ -664,12 +664,12 @@ static void __init of_unittest_parse_phandle_with_args_map(void) memset(&args, 0, sizeof(args)); EXPECT_BEGIN(KERN_INFO, - "OF: /testcase-data/phandle-tests/consumer-b: could not find phandle"); + "OF: /testcase-data/phandle-tests/consumer-b: could not find phandle 12345678"); rc = of_parse_phandle_with_args_map(np, "phandle-list-bad-phandle", "phandle", 0, &args); EXPECT_END(KERN_INFO, - "OF: /testcase-data/phandle-tests/consumer-b: could not find phandle"); + "OF: /testcase-data/phandle-tests/consumer-b: could not find phandle 12345678"); unittest(rc == -EINVAL, "expected:%i got:%i\n", -EINVAL, rc);