From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (NAM10-MW2-obe.outbound.protection.outlook.com [40.107.94.41]) by mx.groups.io with SMTP id smtpd.web11.28141.1669849140940872914 for ; Wed, 30 Nov 2022 14:59:01 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@nvidia.com header.s=selector2 header.b=R8DInSFw; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: nvidia.com, ip: 40.107.94.41, mailfrom: jeshuas@nvidia.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iBNubWAGmNaty3ZuupPXcTHFMsFLVYlsz8eo6scNpebiZlGiDZY3aMMJBgJZndFE89gYYGij/v3MiCSrTYfWtNTfFLLO2vwuvhFXYBhUy1i02Me4IBusL5TWFSU2a5ta20N3yiZ8KQXkEL/slZRquzJ2dtPx5FLy8tCJoVTOdFB9EEokyuy9LXJR4r7zpb00ZGu3ACK0NrlgxOrhGpkKEnr8q8k9buBOD/LVaDYWpEiEdszsyMFGt2tytI5IindjjEUrrvJWFs71xz3jn3jgPpKYhuZrXQimG307fv+uM6nZLpeEu3NuP/hCyB/kHpLdSbibrdv0VFHbMP3XPMAUFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=cnUGzf2Uz0UXGfDMYJP5GHgB7Jfz0Vt/1vUBpnyPqCo=; b=MG3ZQBI4n/QyXtDs2NJXMU+Ieeykcg2ChCHzaApAXxcWNng67RNDi/VmyKOgcfKEUV/YqULn3nDnySV/ioIjI4CFHeOHNoxhj3UAj/7Bk7Y7oqNvRRQEZriwqetSNHG5wAB+J7gS1FnDhkJFKdRAxnFC+Y/RzjdYWaF8Yb4vygWhDpNlWn+Ctn68n4Nvbjy16qF0HK/jmRRKaQ+C8srcrNuhZ8o5F8gf6qGKd2/n4l1j3UH8mX1nBufoHoGChECfOCb84BfbfTiCDR/uMMS11ClMdiforCehn8ZAPM4CXW1RQudUvAXreO0ojHUtmLvJZ1+q5WuipHsgStmnAGFXfw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cnUGzf2Uz0UXGfDMYJP5GHgB7Jfz0Vt/1vUBpnyPqCo=; b=R8DInSFwe9x9NfsgI8IL/87JrBnX+Tf1tJZ07hEHSY6AT2B7z/Y8EB9zFXWoBTUy9XxWMXnC8AUNUBbWZ4hsIiQgocfCcnJksFK3XU6kiEaM/SMryMBIlRxbZiyz7TD3DZMhdOyUOXQiHxbtTCv+8iloQdJmbnk7eCZ4q3Q1W9tvzrprkNuo75i//Qchv4GBYFC+xtFNc987d9YSTp30Mgb0WHCdUCdCajEQCPxswa63OOmxF0KEGzuDT9uiUw1pp/2+Z/snyfuQQiAvusM4lAMEAmExw4JRV0HNfY5Y9P36rWH6DQ3OrD0KbCFB/fp5/APqMpcHWzd+6AGIYBZFrQ== Received: from DS7PR05CA0029.namprd05.prod.outlook.com (2603:10b6:5:3b9::34) by DM4PR12MB5842.namprd12.prod.outlook.com (2603:10b6:8:65::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5857.23; Wed, 30 Nov 2022 22:58:59 +0000 Received: from DM6NAM11FT050.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3b9:cafe::5c) by DS7PR05CA0029.outlook.office365.com (2603:10b6:5:3b9::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.8 via Frontend Transport; Wed, 30 Nov 2022 22:58:58 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by DM6NAM11FT050.mail.protection.outlook.com (10.13.173.111) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.8 via Frontend Transport; Wed, 30 Nov 2022 22:58:58 +0000 Received: from rnnvmail202.nvidia.com (10.129.68.7) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Wed, 30 Nov 2022 14:58:50 -0800 Received: from rnnvmail201.nvidia.com (10.129.68.8) by rnnvmail202.nvidia.com (10.129.68.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Wed, 30 Nov 2022 14:58:50 -0800 Received: from build-jeshuas-20220912T090427831.internal (10.127.8.9) by mail.nvidia.com (10.129.68.8) with Microsoft SMTP Server id 15.2.986.36 via Frontend Transport; Wed, 30 Nov 2022 14:58:50 -0800 From: "Jeshua Smith" To: CC: , , , Jeshua Smith Subject: [PATCH v2] UnitTestFrameworkPkg/UnitTestLib: Print expected Status on ASSERT fail Date: Wed, 30 Nov 2022 22:58:46 +0000 Message-ID: X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-NVConfidentiality: public Return-Path: jeshuas@nvidia.com X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT050:EE_|DM4PR12MB5842:EE_ X-MS-Office365-Filtering-Correlation-Id: ad9a9759-8298-49dc-05e5-08dad3267745 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wI6DM6D/AU3CMsrdkqvb0frxlQ47fYJj/uKCp2tY0725JuA9uQlKLOuIQPrmbEwEejNpr3Tcbtx4i8QAqeb1iZjcyhFJHj7Gsg01KC7uqkGkiz32bT4adGsndCOZhu+hnqOdyykIifMHVD6Y6ogDf14z/Q39rqmAo4nvfaWmMkz/HRgYu7C0BotZn12N/eTJTbnUb6Rp32JeSuHC9Vu/bYNp84ao50ipahbYgLmJianwUAdI3GUMCGFs4fNVDnjol6M6x2eF0JSuDsKArnyFTiLtKG3OSWM0CXoVWUWUcq0o9CvmZkFIEgjIsW05WfuSTTHWQEre5vVCgIWJbkebz+U+gwY2HXIfDO8kxApk3eifycJQ1IiEaE6rBctqNTf9NnPmq5EeyTawME0MNw8eJ7VIR7Xc+JbOuEAy7rENyXbbWkQdH+b2+qsWkYZP3kFVihjOuqY96gXS3jxcPnZVXjm1PtQf6TLoOQP6INlOIL+8U2gGKSbVuZv1rCNZjnWkwsX4XZ1KQrA2YU2GYx8rFXJy4+tFfPkw91b24u63h3EONT6+AcpnjSDrkuJGw3yQialiCJGGEm+XGpuYLe4KOiHUlzlHLLJ2tdQeqzcLrmTibJIYsNQ1D3T9ou/A0hI4lFbqhxK1aTpHI0B0D1HRZ83GEFrNQDjI5lVBhyhoei+PRMpF0odJ686HrhcnzQmpDEp+7BPvFT9strY7gYbpcw== X-Forefront-Antispam-Report: CIP:216.228.117.160;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge1.nvidia.com;CAT:NONE;SFS:(13230022)(4636009)(136003)(39860400002)(346002)(396003)(376002)(451199015)(36840700001)(40470700004)(46966006)(7636003)(82740400003)(478600001)(36756003)(82310400005)(40480700001)(26005)(6666004)(40460700003)(41300700001)(70206006)(70586007)(356005)(8676002)(86362001)(426003)(4326008)(316002)(54906003)(6916009)(8936002)(5660300002)(336012)(47076005)(2616005)(186003)(107886003)(83380400001)(2906002)(36860700001);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Nov 2022 22:58:58.8170 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ad9a9759-8298-49dc-05e5-08dad3267745 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.160];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT050.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5842 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain Update the UnitTestAssertStatusEqual error message to print out the expected value in addition to the seen value. Change-Id: Ic651584dcdbcf1f8cd8166ad8058744fc0587d72 Signed-off-by: Jeshua Smith --- UnitTestFrameworkPkg/Library/UnitTestLib/AssertCmocka.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UnitTestFrameworkPkg/Library/UnitTestLib/AssertCmocka.c b/Unit= TestFrameworkPkg/Library/UnitTestLib/AssertCmocka.c index dc05bbd438..0d8e36c938 100644 --- a/UnitTestFrameworkPkg/Library/UnitTestLib/AssertCmocka.c +++ b/UnitTestFrameworkPkg/Library/UnitTestLib/AssertCmocka.c @@ -290,7 +290,7 @@ UnitTestAssertStatusEqual ( {=0D CHAR8 TempStr[MAX_STRING_SIZE];=0D =0D - snprintf (TempStr, sizeof (TempStr), "UT_ASSERT_STATUS_EQUAL(%s:%p)", De= scription, (VOID *)Status);=0D + snprintf (TempStr, sizeof (TempStr), "UT_ASSERT_STATUS_EQUAL(%s:%p expec= ted:%p)", Description, (VOID *)Status, (VOID *)Expected);=0D _assert_true ((Status =3D=3D Expected), TempStr, FileName, (INT32)LineNu= mber);=0D =0D return (Status =3D=3D Expected);=0D --=20 2.25.1