From mboxrd@z Thu Jan 1 00:00:00 1970 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 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: michael.d.kinney@intel.com) 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 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" 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: [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> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20200709040521.3748-1-michael.d.kinney@intel.com> References: <20200709040521.3748-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2806 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/UnitTestFrameworkPkg/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 != ValueB) { UnitTestLogFailure ( FAILURETYPE_ASSERTEQUAL, - "%a::%d Value %a != %a (%d != %d)!\n", - FunctionName, + "%a:%d: Value %a != %a (%d != %d)!\n", + FileName, LineNumber, DescriptionA, DescriptionB, @@ -259,8 +259,8 @@ UnitTestAssertEqual ( ValueB ); UT_LOG_ERROR ( - "[ASSERT FAIL] %a::%d Value %a != %a (%d != %d)!\n", - FunctionName, + "[ASSERT FAIL] %a:%d: Value %a != %a (%d != %d)!\n", + FileName, LineNumber, DescriptionA, DescriptionB, @@ -312,16 +312,16 @@ UnitTestAssertMemEqual ( if (CompareMem(BufferA, BufferB, Length) != 0) { UnitTestLogFailure ( FAILURETYPE_ASSERTEQUAL, - "%a::%d Memory at %a != %a for length %d bytes!\n", - FunctionName, + "%a:%d: Memory at %a != %a for length %d bytes!\n", + FileName, LineNumber, DescriptionA, DescriptionB, Length ); UT_LOG_ERROR ( - "[ASSERT FAIL] %a::%d Value %a != %a for length %d bytes!\n", - FunctionName, + "[ASSERT FAIL] %a:%d: Value %a != %a for length %d bytes!\n", + FileName, LineNumber, DescriptionA, DescriptionB, @@ -368,8 +368,8 @@ UnitTestAssertNotEqual ( if (ValueA == ValueB) { UnitTestLogFailure ( FAILURETYPE_ASSERTNOTEQUAL, - "%a::%d Value %a == %a (%d == %d)!\n", - FunctionName, + "%a:%d: Value %a == %a (%d == %d)!\n", + FileName, LineNumber, DescriptionA, DescriptionB, @@ -377,8 +377,8 @@ UnitTestAssertNotEqual ( ValueB ); UT_LOG_ERROR ( - "[ASSERT FAIL] %a::%d Value %a == %a (%d == %d)!\n", - FunctionName, + "[ASSERT FAIL] %a:%d: Value %a == %a (%d == %d)!\n", + FileName, LineNumber, DescriptionA, DescriptionB, @@ -423,16 +423,16 @@ UnitTestAssertStatusEqual ( if (Status != 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 == 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