From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (NAM12-DM6-obe.outbound.protection.outlook.com [40.107.243.121]) by mx.groups.io with SMTP id smtpd.web11.220.1594785971793386901 for ; Tue, 14 Jul 2020 21:06:12 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@microsoft.com header.s=selector2 header.b=VNShWxoj; spf=pass (domain: microsoft.com, ip: 40.107.243.121, mailfrom: bret.barkelew@microsoft.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Pw3tY4o+i+0pD1L2gwnKC/Czl+hb/dNXH7KM5gCw1QF4ymG4vgwbOYcXvyslV/HGHC6FCKOTxAL8G6Yj7I0AsmfG/pjFD69p0XiyI5XxTEOTdcENPrYCaViGtB1EoI8iU54dUc8bymFxV2OBodXd17KlXaphbzAm4stJeF7QnWtP2g7fUGSOlqT8n9EuAkWWXe5Q7Z1+nOubARxkBdB8ghxDK2eT2HMH5luabx7IJhF6cXYGNxilh0sbxeb43/BO10rygIKlznKOoY6MJ2S6ypxE28JinvvMzt6Uu3uMF/ukq+IRP9qON4PXChs4NHR1CrFREQQTA9ZxGGcAgZPFMw== 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-SenderADCheck; bh=dG/U6DMeuGxi/qAGdKkhzbEy9aWldp5acPlr3DVik94=; b=QGPVZk9hR0t8f+Yfvhoi3Yn5hDo4iXIrJzunb5P2IBjFh5PgMqK7oiA8IjFmFk8kSbqvf8DQuzSMHF6dsv1RamoZIZp1IvxgIzXG6sw8cL3Q++QHqalbSKqkEYeIrxnWoEBWLBq4Wacl7V6FunvExZojPj5ZXY+2BgxtNYfJJSZPWgd5OOu0/XAAtxfqjpYNk+iJx3/VjSA2i8GEAwzbjX+oBlUpUDVQ/n20yY3NQRoazIQDEF5rywHdz5R2857PVswTjw091JdzxzcgKaiYu/AqZYCYlwYOk2w6IA1OzwqVcu852BRbJVhkS++LHINmwp8xvt0bm6b69sEURKJtAg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=microsoft.com; dmarc=pass action=none header.from=microsoft.com; dkim=pass header.d=microsoft.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=dG/U6DMeuGxi/qAGdKkhzbEy9aWldp5acPlr3DVik94=; b=VNShWxoj5MYQi92UHlzQmTGlLqhlToBR5kRZ9MakJqiS+wFmOlEoDjSeVI7aCpIsiLp5l2kSDA2l1r6BEr5908OZo+rUf0fMhj7+rZs1WiqsyS7SoMH/EIfijvURjHBIAr0UzC62M8EsjefxnbY3QFliCfHnhBksWpu/+pXbLn8= Received: from CY4PR21MB0743.namprd21.prod.outlook.com (2603:10b6:903:b2::9) by CY4PR21MB0504.namprd21.prod.outlook.com (2603:10b6:903:dc::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3216.7; Wed, 15 Jul 2020 04:06:10 +0000 Received: from CY4PR21MB0743.namprd21.prod.outlook.com ([fe80::f112:82fb:d4fd:f7dd]) by CY4PR21MB0743.namprd21.prod.outlook.com ([fe80::f112:82fb:d4fd:f7dd%10]) with mapi id 15.20.3216.008; Wed, 15 Jul 2020 04:06:10 +0000 From: "Bret Barkelew" To: "Kinney, Michael D" , "devel@edk2.groups.io" CC: Sean Brogan , "Yao, Jiewen" Subject: Re: [EXTERNAL] [Patch v3 11/16] UnitTestFrameworkPkg/UnitTestLib: Fix target mode log messages Thread-Topic: [EXTERNAL] [Patch v3 11/16] UnitTestFrameworkPkg/UnitTestLib: Fix target mode log messages Thread-Index: AQHWVyhLr1T2+UoxDU28HREdqgebzqkIDDWz Date: Wed, 15 Jul 2020 04:06:10 +0000 Message-ID: References: <20200711020904.24116-1-michael.d.kinney@intel.com>,<20200711020904.24116-12-michael.d.kinney@intel.com> In-Reply-To: <20200711020904.24116-12-michael.d.kinney@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Enabled=True;MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SiteId=72f988bf-86f1-41af-91ab-2d7cd011db47;MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SetDate=2020-07-15T04:06:05.6394688Z;MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_ContentBits=0;MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Method=Privileged authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=microsoft.com; x-originating-ip: [174.21.66.92] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: e98443be-4650-4735-c93b-08d828746841 x-ms-traffictypediagnostic: CY4PR21MB0504: x-ms-exchange-transport-forked: True x-ld-processed: 72f988bf-86f1-41af-91ab-2d7cd011db47,ExtAddr x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:7691; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: bUU6x5MuoCoTxO3cVEBJHY6BifLXuAirH85qlBrWOFEB0ALoR0LaQGU8C34PKL0El3lE62BhnM+TgUXViESPoGnAgT/bO0z9kuERtq+obj5CuPVqaBMF2Z/Nx2nwZaKIfDs5OMEY6FxU5dCUQVFhGseOCmiAu8+MrcVfVSDsh8OEaowmT4C/ggWzKG0M2Wvqwnjd/5NgPmcUvZGz+WAb+LyJT0HYDbTw3BwElBeif4UGxoO2jQoWPGZ7iT41Sf9836R1WPMIl1fJtz8BOSmiD3X+dztC0NlWV8gyFaL1ELHaAjs11OoYVLVbChgRT+AaKP+iaSgQuNZbgfgl9eOGFj8NzVgBknK6YWiNQlQHLKshwFZU1POAwZtMt00hnNybMP/Lrg14ajJrIABDqVTsAg== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CY4PR21MB0743.namprd21.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(346002)(136003)(376002)(396003)(366004)(39860400002)(186003)(4326008)(91956017)(316002)(66476007)(82950400001)(6506007)(82960400001)(76116006)(15650500001)(52536014)(66556008)(2906002)(64756008)(110136005)(54906003)(66946007)(8990500004)(166002)(55016002)(53546011)(9686003)(7696005)(86362001)(8676002)(5660300002)(966005)(26005)(83380400001)(10290500003)(71200400001)(478600001)(66446008)(33656002)(8936002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: F+/jQhoOHukR3OSh/ovYwM/FLypOFXK8vM5q3J+EKRIelCFwx6eJ8HqW/jHepbIhdOWv3HDEN+mL+O98Mg4b5osuz0nvE92zAuz0GQzxWx9qEx0YXLOMMh3TyzcMFaGHphH8jT9R/t/rTIj/gijvfU/pBf/pGaz44+oCTRUBqYhQqAnScvRzePPcUXdTU6pVqbVFC/B4UJPh1vMNQANrZSypXDxB4N5MlmYwBpTC1GOr8fET9rIIO9b4POpfmH5ZXWtSXiG9jJxwp5OaJqdKNpoxR4eU49rp7mVJqp6G5G8BfpEkvPwIT17csHURVcXi8zhDmqkzZpw3hzX4ahSJ4CBIm4ncmGjwUN5J9sazyQHybx3AGJ2zon+bS7WpjKPht4+/jVAYLMuKrq11qajkDMbnm6m/MRojg/7a8QMHdNUzOD/yVDK2pNFanDQ5LY93NAVUZPrWcI0S7gcVeOZ2bOPK9DWPDVN7XO8Vk1djF7w= MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: CY4PR21MB0743.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e98443be-4650-4735-c93b-08d828746841 X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Jul 2020 04:06:10.1515 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 4KAzxqFVKwJuQpQwYAqaad5FdJsUSFQaozt8j5xy1oWHyK0WDPMmtHGuLlCZlL1U6hhbJFayxTmnw0A6/AiUyg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR21MB0504 Content-Language: en-US Content-Type: multipart/alternative; boundary="_000_CY4PR21MB07434838C32D6FFDA2655D02EF7E0CY4PR21MB0743namp_" --_000_CY4PR21MB07434838C32D6FFDA2655D02EF7E0CY4PR21MB0743namp_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Bret Barkelew - Bret ________________________________ From: Michael D Kinney Sent: Friday, July 10, 2020 7:08:59 PM To: devel@edk2.groups.io Cc: Sean Brogan ; Bret Barkelew ; Yao, Jiewen Subject: [EXTERNAL] [Patch v3 11/16] UnitTestFrameworkPkg/UnitTestLib: Fix = target mode log messages REF: https://nam06.safelinks.protection.outlook.com/?url=3Dhttps%3A%2F%2Fbu= gzilla.tianocore.org%2Fshow_bug.cgi%3Fid%3D2806&data=3D02%7C01%7CBret.B= arkelew%40microsoft.com%7C37f4c773c1684ce41aea08d8253f692e%7C72f988bf86f141= af91ab2d7cd011db47%7C1%7C0%7C637300301580380663&sdata=3DxRivgP78PSA7wfj= oPw8LZL9U9Fnh5x7LClkYmnVGL4M%3D&reserved=3D0 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 ); -- 2.21.0.windows.1 --_000_CY4PR21MB07434838C32D6FFDA2655D02EF7E0CY4PR21MB0743namp_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable

Reviewed-by: Bret Barkelew <bret.barkelew@microso= ft.com>

 

 

- Bret

 

From: Michael D Kinney <= michael.d.kinney@intel.com>
Sent: Friday, July 10, 2020 7:08:59 PM
To: devel@edk2.groups.io <devel@edk2.groups.io>
Cc: Sean Brogan <sean.brogan@microsoft.com>; Bret Barkelew <= ;Bret.Barkelew@microsoft.com>; Yao, Jiewen <jiewen.yao@intel.com><= br> Subject: [EXTERNAL] [Patch v3 11/16] UnitTestFrameworkPkg/UnitTestLi= b: Fix target mode log messages
 
REF: https://nam06.safelinks.protection.outlook.com/?url=3Dhttps%3A%2F%2Fbugzill= a.tianocore.org%2Fshow_bug.cgi%3Fid%3D2806&amp;data=3D02%7C01%7CBret.Ba= rkelew%40microsoft.com%7C37f4c773c1684ce41aea08d8253f692e%7C72f988bf86f141a= f91ab2d7cd011db47%7C1%7C0%7C637300301580380663&amp;sdata=3DxRivgP78PSA7= wfjoPw8LZL9U9Fnh5x7LClkYmnVGL4M%3D&amp;reserved=3D0

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 <sean.brogan@microsoft.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 .../Library/UnitTestLib/Assert.c      &= nbsp;       | 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 E= FI_ERROR (%r)!\n",
-      FunctionName,
+      "[ASSERT FAIL] %a:%d: Status '%a' is E= FI_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 lengt= h %d bytes!\n",
-      FunctionName,
+      "%a:%d: Memory at %a !=3D %a for lengt= h %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
       );
--
2.21.0.windows.1

--_000_CY4PR21MB07434838C32D6FFDA2655D02EF7E0CY4PR21MB0743namp_--