From nobody Tue Nov 26 02:47:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+62288+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+62288+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1594267542; cv=none; d=zohomail.com; s=zohoarc; b=VxBJhGK3FNiL4oorJnC0JUEdLFgW69qaP/JtJbnAISydSOQ+Svg12zAj51fICOAz4bSnB07gMASl/HlNB74cWG9orXCCYJ35S6T5vTr9EWD/lC48y3fAuFuA3+kyRan7mV6/C4cHC600FeL2CMzYIcbyHHBs/8PK1eqmulg/1uU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594267542; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=RySobCmaDpRYQFH3H1s36JzL7K6Qm1LoyeNDCrwxFyU=; b=GTGRAxAwJJxSQFkqPyQuUz0XXcEFpW+NhZp+peGRTRoOM9m90lRNO0/lqmOBUlxM42FNWd4ep92nlzujGliaXLCylPAKj0wRtUTuUX5Qn9F7bTB83sRP57ifS+UsqTDUnTBSYXSTyG5TVK4iPloTi4uPVq8aBXLjBaXJYtxUEPc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+62288+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1594267542227833.2780034857204; Wed, 8 Jul 2020 21:05:42 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id ashDYY1788612xgnMV4Uat60; Wed, 08 Jul 2020 21:05:41 -0700 X-Received: from mga07.intel.com (mga07.intel.com []) by mx.groups.io with SMTP id smtpd.web11.4378.1594267536731145998 for ; Wed, 08 Jul 2020 21:05:40 -0700 IronPort-SDR: ihg/7TjGopn4+8Yc7hP4AMcfE3KabQCVjzswNaIDrBP9z6vs+A82YM5jzXF8KK2hCpxWXWb72w XPirrtlcNxlA== X-IronPort-AV: E=McAfee;i="6000,8403,9676"; a="212851112" X-IronPort-AV: E=Sophos;i="5.75,330,1589266800"; d="scan'208";a="212851112" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2020 21:05:39 -0700 IronPort-SDR: I8JdS3T/hOmZiQ+w54KNQsX93uatMtbayA1rcINkKq9nCee+N14lYKmx3p4b4yMozI+Vmcpbj4 dchm5OmqpvuA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,330,1589266800"; d="scan'208";a="280163950" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.255.230.8]) by orsmga003.jf.intel.com with ESMTP; 08 Jul 2020 21:05:39 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Sean Brogan , Bret Barkelew , Jiewen Yao Subject: [edk2-devel] [Patch v2 11/16] UnitTestFrameworkPkg/UnitTestLib: Fix target mode log messages Date: Wed, 8 Jul 2020 21:05:16 -0700 Message-Id: <20200709040521.3748-12-michael.d.kinney@intel.com> In-Reply-To: <20200709040521.3748-1-michael.d.kinney@intel.com> References: <20200709040521.3748-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com X-Gm-Message-State: 78iJIXfFYtsel1P0S37dOK2bx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1594267541; bh=YNR6BhlbzM3y0cvAFoJDvB7AV8xt1dMSFlsVuFEv+zk=; h=Cc:Date:From:Reply-To:Subject:To; b=mYV6AxX+yLUOXvv4Gfn/G0SHPu6AoAh/W8QV3KqAu/7bOlz9hEZuzMzgleIGV408898 LseLZN4PNhzzbKNQvWVljib6J6SGKkC+ysXVVQtIHzeo5eEj9La1EqRu6mYynwMaeHHVq +pZdANE5CvYEXlzEVOdZE4RZggRtjrM1+v0= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2806 Update the log messages generated in target mode to use FileName instead of FunctionName. FunctionName is an empty string so the log messages generated do not provide enough information to know the source of a unit test failure. Using FileName combined with LineNumber provides the right information to identify the location of a unit test failure. Cc: Sean Brogan Cc: Bret Barkelew Cc: Jiewen Yao Signed-off-by: Michael D Kinney --- .../Library/UnitTestLib/Assert.c | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/UnitTestFrameworkPkg/Library/UnitTestLib/Assert.c b/UnitTestFr= ameworkPkg/Library/UnitTestLib/Assert.c index c327ba88f1..8a131fab2b 100644 --- a/UnitTestFrameworkPkg/Library/UnitTestLib/Assert.c +++ b/UnitTestFrameworkPkg/Library/UnitTestLib/Assert.c @@ -105,14 +105,14 @@ UnitTestAssertTrue ( if (!Expression) { UnitTestLogFailure ( FAILURETYPE_ASSERTTRUE, - "%a::%d Expression (%a) is not TRUE!\n", - FunctionName, + "%a:%d: Expression (%a) is not TRUE!\n", + FileName, LineNumber, Description ); UT_LOG_ERROR ( - "[ASSERT FAIL] %a::%d Expression (%a) is not TRUE!\n", - FunctionName, + "[ASSERT FAIL] %a:%d: Expression (%a) is not TRUE!\n", + FileName, LineNumber, Description ); @@ -151,14 +151,14 @@ UnitTestAssertFalse ( if (Expression) { UnitTestLogFailure ( FAILURETYPE_ASSERTFALSE, - "%a::%d Expression(%a) is not FALSE!\n", - FunctionName, + "%a:%d: Expression(%a) is not FALSE!\n", + FileName, LineNumber, Description ); UT_LOG_ERROR ( - "[ASSERT FAIL] %a::%d Expression (%a) is not FALSE!\n", - FunctionName, + "[ASSERT FAIL] %a:%d: Expression (%a) is not FALSE!\n", + FileName, LineNumber, Description ); @@ -197,15 +197,15 @@ UnitTestAssertNotEfiError ( if (EFI_ERROR (Status)) { UnitTestLogFailure ( FAILURETYPE_ASSERTNOTEFIERROR, - "%a::%d Status '%a' is EFI_ERROR (%r)!\n", - FunctionName, + "%a:%d: Status '%a' is EFI_ERROR (%r)!\n", + FileName, LineNumber, Description, Status ); UT_LOG_ERROR ( - "[ASSERT FAIL] %a::%d Status '%a' is EFI_ERROR (%r)!\n", - FunctionName, + "[ASSERT FAIL] %a:%d: Status '%a' is EFI_ERROR (%r)!\n", + FileName, LineNumber, Description, Status @@ -250,8 +250,8 @@ UnitTestAssertEqual ( if (ValueA !=3D ValueB) { UnitTestLogFailure ( FAILURETYPE_ASSERTEQUAL, - "%a::%d Value %a !=3D %a (%d !=3D %d)!\n", - FunctionName, + "%a:%d: Value %a !=3D %a (%d !=3D %d)!\n", + FileName, LineNumber, DescriptionA, DescriptionB, @@ -259,8 +259,8 @@ UnitTestAssertEqual ( ValueB ); UT_LOG_ERROR ( - "[ASSERT FAIL] %a::%d Value %a !=3D %a (%d !=3D %d)!\n", - FunctionName, + "[ASSERT FAIL] %a:%d: Value %a !=3D %a (%d !=3D %d)!\n", + FileName, LineNumber, DescriptionA, DescriptionB, @@ -312,16 +312,16 @@ UnitTestAssertMemEqual ( if (CompareMem(BufferA, BufferB, Length) !=3D 0) { UnitTestLogFailure ( FAILURETYPE_ASSERTEQUAL, - "%a::%d Memory at %a !=3D %a for length %d bytes!\n", - FunctionName, + "%a:%d: Memory at %a !=3D %a for length %d bytes!\n", + FileName, LineNumber, DescriptionA, DescriptionB, Length ); UT_LOG_ERROR ( - "[ASSERT FAIL] %a::%d Value %a !=3D %a for length %d bytes!\n", - FunctionName, + "[ASSERT FAIL] %a:%d: Value %a !=3D %a for length %d bytes!\n", + FileName, LineNumber, DescriptionA, DescriptionB, @@ -368,8 +368,8 @@ UnitTestAssertNotEqual ( if (ValueA =3D=3D ValueB) { UnitTestLogFailure ( FAILURETYPE_ASSERTNOTEQUAL, - "%a::%d Value %a =3D=3D %a (%d =3D=3D %d)!\n", - FunctionName, + "%a:%d: Value %a =3D=3D %a (%d =3D=3D %d)!\n", + FileName, LineNumber, DescriptionA, DescriptionB, @@ -377,8 +377,8 @@ UnitTestAssertNotEqual ( ValueB ); UT_LOG_ERROR ( - "[ASSERT FAIL] %a::%d Value %a =3D=3D %a (%d =3D=3D %d)!\n", - FunctionName, + "[ASSERT FAIL] %a:%d: Value %a =3D=3D %a (%d =3D=3D %d)!\n", + FileName, LineNumber, DescriptionA, DescriptionB, @@ -423,16 +423,16 @@ UnitTestAssertStatusEqual ( if (Status !=3D Expected) { UnitTestLogFailure ( FAILURETYPE_ASSERTSTATUSEQUAL, - "%a::%d Status '%a' is %r, should be %r!\n", - FunctionName, + "%a:%d: Status '%a' is %r, should be %r!\n", + FileName, LineNumber, Description, Status, Expected ); UT_LOG_ERROR ( - "[ASSERT FAIL] %a::%d Status '%a' is %r, should be %r!\n", - FunctionName, + "[ASSERT FAIL] %a:%d: Status '%a' is %r, should be %r!\n", + FileName, LineNumber, Description, Status, @@ -475,14 +475,14 @@ UnitTestAssertNotNull ( if (Pointer =3D=3D NULL) { UnitTestLogFailure ( FAILURETYPE_ASSERTNOTNULL, - "%a::%d Pointer (%a) is NULL!\n", - FunctionName, + "%a:%d: Pointer (%a) is NULL!\n", + FileName, LineNumber, PointerName ); UT_LOG_ERROR ( - "[ASSERT FAIL] %a::%d Pointer (%a) is NULL!\n", - FunctionName, + "[ASSERT FAIL] %a:%d: Pointer (%a) is NULL!\n", + FileName, LineNumber, PointerName ); --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#62288): https://edk2.groups.io/g/devel/message/62288 Mute This Topic: https://groups.io/mt/75391618/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-