[v1] RecordAssertion function parameter issue.

[PATCH] [edk2-devel] RecordAssertion function parameter issue.

Posted by Chen, ArvinX 3 years, 4 months ago

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3082

Correct "RecordAssertion" argument issue to make SCT tool more stable.

Cc: G Edhaya Chandran <Edhaya.Chandran@arm.com>
Cc: Samer El-Haj-Mahmoud <Samer.El-Haj-Mahmoud@arm.com>
Cc: Eric Jin <eric.jin@intel.com>
Cc: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: ArvinX Chen <arvinx.chen@intel.com>
---
 .../ProtocolHandlerBBTestFunction_3.c             |  8 +++-----
 .../EfiCompliantBBTestPlatform_uefi.c             |  2 +-
 .../AcpiTableProtocolBBTestFunction.c             |  2 +-
 .../BlackBoxTest/BlockIo2BBTestFunction.c         |  3 ++-
 .../BlackBoxTest/ComponentName2BBTestFunction.c   |  6 +++---
 .../DevicePathFromTextBBTestCoverage.c            |  5 +++--
 .../DevicePathUtilitiesBBTestConformance.c        | 15 ++++++++++-----
 .../DriverDiagnostics2BBTestFunction.c            |  4 ++--
 .../BlackBoxTest/EraseBlockBBTestConformance.c    |  8 ++++----
 .../BlackBoxTest/GraphicsOutputBBTestFunction.c   |  8 +++++---
 .../BlackBoxTest/HIIFontBBTestConformance.c       |  3 +--
 .../BlackBoxTest/HIIImageBBTestConformance.c      |  4 ++--
 .../BlackBoxTest/HIIStringBBTestConformance.c     |  3 +--
 .../BlackBoxTest/IPsecConfigBBTestConformance.c   |  8 ++++----
 .../PciIo/BlackBoxTest/PciIoBBTestFunction_1.c    |  5 +++--
 .../BlackBoxTest/PxeBaseCodeBBTestFunction.c      |  2 +-
 .../BlackBoxTest/SimpleFileSystemBBTestFunction.c |  2 +-
 .../SimpleFileSystemExBBTestFunction_OpenEx.c     | 10 +++++-----
 .../BlackBoxTest/SimpleNetworkBBTestConformance.c |  2 +-
 .../UFSDeviceConfigBBTestConformance.c            |  6 +++---
 .../VariableServicesBBTestConformance.c           |  6 ++++--
 .../BlackBoxTest/BlockIo2BBTestFunction.c         |  3 ++-
 .../BlackBoxTest/ComponentName2BBTestFunction.c   |  6 +++---
 .../DriverDiagnostics2BBTestFunction.c            |  4 ++--
 .../BlackBoxTest/GraphicsOutputBBTestFunction.c   |  8 +++++---
 .../BlackBoxTest/PxeBaseCodeBBTestFunction.c      |  2 +-
 .../BlackBoxTest/SimpleFileSystemBBTestFunction.c |  2 +-
 .../SimpleFileSystemExBBTestFunction_OpenEx.c     | 10 +++++-----
 .../BlackBoxTest/SimpleNetworkBBTestConformance.c |  2 +-
 29 files changed, 80 insertions(+), 69 deletions(-)

diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/ProtocolHandlerBBTestFunction_3.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/ProtocolHandlerBBTestFunction_3.c
index 8ad31f7f..94288b23 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/ProtocolHandlerBBTestFunction_3.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/BlackBoxTest/ProtocolHandlerBBTestFunction_3.c
@@ -11672,7 +11672,6 @@ BBTestOpenProtocolInformationInterfaceTestCheckPoint1 (
                      L"%a:%d:TPL - %d",
                      __FILE__,
                      (UINTN)__LINE__,
-                     EntryCount,
                      TplArray[Index]
                      );
       //
@@ -11825,7 +11824,6 @@ BBTestOpenProtocolInformationInterfaceTestCheckPoint1 (
                    L"%a:%d:TPL - %d",
                    __FILE__,
                    (UINTN)__LINE__,
-                   EntryCount,
                    TplArray[Index]
                    );
     //
@@ -15398,11 +15396,11 @@ BBTestConnectControllerInterfaceTestCheckPoint14 (
                    EFI_TEST_ASSERTION_FAILED,
                    gTestGenericFailureGuid,
                    L"GetPlatformOverrideDriverImages - build environment",
-                   L"%a:%d:Status - %r, NoHandles - %d",
+                   L"%a:%d:Status - %r",
                    __FILE__,
                    (UINTN)__LINE__,
                    Status
-                     );
+                   );
     goto Done;
   }
 
@@ -15699,7 +15697,7 @@ BBTestConnectControllerInterfaceTestCheckPoint15 (
                    EFI_TEST_ASSERTION_FAILED,
                    gTestGenericFailureGuid,
                    L"GetPlatformOverrideDriverImages - build environment",
-                   L"%a:%d:Status - %r, NoHandles - %d",
+                   L"%a:%d:Status - %r",
                    __FILE__,
                    (UINTN)__LINE__,
                    Status
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestPlatform_uefi.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestPlatform_uefi.c
index 052f45b7..ffb8d8ea 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestPlatform_uefi.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestPlatform_uefi.c
@@ -1017,7 +1017,7 @@ CheckConsoleProtocols (
                  AssertionType,
                  gEfiCompliantBbTestPlatformAssertionGuid001,
                  L"UEFI Compliant - Console protocols must be implemented",
-                 L"%a:%d:Text Input - %s, Text Output - %s, Text InputEx",
+                 L"%a:%d:Text Input - %s, Text Output - %s, Text InputEx - %s",
                  __FILE__,
                  (UINTN)__LINE__,
                  ValueA ? L"Yes" : L"No",
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ACPITable/BlackBoxTest/AcpiTableProtocolBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ACPITable/BlackBoxTest/AcpiTableProtocolBBTestFunction.c
index e1f5ccee..51ce391d 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ACPITable/BlackBoxTest/AcpiTableProtocolBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ACPITable/BlackBoxTest/AcpiTableProtocolBBTestFunction.c
@@ -303,7 +303,7 @@ BBTestInstallAcpiTableFunctionTestCheckpoint1 (
                  __FILE__,
                  (UINTN)__LINE__,
                  Status
-                 ); 
+                 );
 
   if (EFI_SUCCESS == Status) {
     Status = AcpiTable->UninstallAcpiTable (
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo2/BlackBoxTest/BlockIo2BBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo2/BlackBoxTest/BlockIo2BBTestFunction.c
index 8ccbfaf2..551f4671 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo2/BlackBoxTest/BlockIo2BBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo2/BlackBoxTest/BlockIo2BBTestFunction.c
@@ -4686,7 +4686,8 @@ BBTestFushBlocksExFunctionAutoTestCheckpoint1(
                    __FILE__,
                    (UINTN)__LINE__,
                    4,
-                   EFI_SUCCESS
+                   EFI_SUCCESS,
+                   BlockIo2TokenBuffer[IndexI].TransactionStatus
                    );
     
     Status = gtBS->SetTimer (TimerEvent, TimerCancel, 0);
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName2/BlackBoxTest/ComponentName2BBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName2/BlackBoxTest/ComponentName2BBTestFunction.c
index 9d5d9ffc..3b653498 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName2/BlackBoxTest/ComponentName2BBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName2/BlackBoxTest/ComponentName2BBTestFunction.c
@@ -766,10 +766,10 @@ BBTestGetControllerNameFuncTestCheckpoint2 (
                          AssertionType,
                          gComponentName2BBTestFunctionAssertionGuid003,
                          L"Please Use Native RFC3066 which is preferable in UEFI 2.X\nCOMPONENT_NAME2_PROTOCOL.GetControllerName - GetControllerName() returns EFI_SUCCESS support language",
-                         L"%a:%d: Language - %c%c%c, ControllerIndex - %d, ChildIndex - %d, ControllerName - %s, Status - %r",
-		                 __FILE__,
+                         L"%a:%d: Language - %c%c%c%c, ControllerIndex - %d, ChildIndex - %d, ControllerName - %s, Status - %r",
+                         __FILE__,
                          (UINTN)__LINE__,
-                         Lang,
+                         Lang[0],Lang[1],Lang[2],Lang[3],
                          Index,
                          ChildIndex,
                          (ControllerName == NULL) ? L"(NULL)" : ControllerName,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTestCoverage.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTestCoverage.c
index 5058dc4a..9a7b908a 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTestCoverage.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest/DevicePathFromTextBBTestCoverage.c
@@ -2233,7 +2233,8 @@ DevicePathFromTextConvertTextToDeviceNodeCoverageTest (
                 L"EFI_DEVICE_PATH_FROM_TEXT_PROTOCOL - ConvertDeviceNodeToText must correctly recover the converting ConvertTextToDeviceNode has acted on the device node string",
                 L"%a:%d, Convert MemoryMapped(%d,0x123456789ABCDEF,0xFEDCBA9876543210)",
                 __FILE__,
-                (UINTN)__LINE__
+                (UINTN)__LINE__,
+                EfiMaxMemoryType
                 );
 
   //
@@ -3414,7 +3415,7 @@ DevicePathFromTextConvertTextToDeviceNodeCoverageTest (
                 L"%a:%d, Convert SD(0)",
                 __FILE__,
                 (UINTN)__LINE__
-                );  
+                );
 
   //
   // Bluetooth(001320F5FA77) 
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathUtilities/BlackBoxTest/DevicePathUtilitiesBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathUtilities/BlackBoxTest/DevicePathUtilitiesBBTestConformance.c
index d8d237a6..32122a78 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathUtilities/BlackBoxTest/DevicePathUtilitiesBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathUtilities/BlackBoxTest/DevicePathUtilitiesBBTestConformance.c
@@ -90,7 +90,8 @@ DevicePathUtilitiesCreateDeviceNodeConformanceTest (
                 L"EFI_DEVICE_PATH_UTILITIES_PROTOCOL - CreatDeviceNode should not succeed with invalid NodeLength set",
                 L"%a:%d:Status - %r",
                 __FILE__,
-                (UINTN)__LINE__
+                (UINTN)__LINE__,
+                Status
                 );
 
   return EFI_SUCCESS;
@@ -284,7 +285,8 @@ DevicePathUtilitiesAppendDevicePathConformanceTest (
                 L"EFI_DEVICE_PATH_UTILITIES_PROTOCOL - SctAppendDevicePath should ignore Src1 when it is set NULL",
                 L"%a:%d:Status - %r",
                 __FILE__,
-                (UINTN)__LINE__
+                (UINTN)__LINE__,
+                Status
                 );
 
   //
@@ -326,7 +328,8 @@ DevicePathUtilitiesAppendDevicePathConformanceTest (
                 L"EFI_DEVICE_PATH_UTILITIES_PROTOCOL - SctAppendDevicePath should ignore Src2 when it is set NULL",
                 L"%a:%d:Status - %r",
                 __FILE__,
-                (UINTN)__LINE__
+                (UINTN)__LINE__,
+                Status
                 );
 
   pDevicePath1    = DevicePathUtilities->AppendDevicePath (NULL, NULL);
@@ -417,7 +420,8 @@ DevicePathUtilitiesAppendDevicePathInstanceConformanceTest (
                 L"EFI_DEVICE_PATH_UTILITIES_PROTOCOL - AppendDevicePathInstance should not succeed with DevicePathInstance set to be NULL",
                 L"%a:%d:Status - %r",
                 __FILE__,
-                (UINTN)__LINE__
+                (UINTN)__LINE__,
+                Status
                 );
 
   return EFI_SUCCESS;
@@ -473,7 +477,8 @@ DevicePathUtilitiesGetNextDevicePathInstanceConformanceTest (
                 L"EFI_DEVICE_PATH_UTILITIES_PROTOCOL - GetNextDevicePathInstance should not succeed with DevicePathInstance set to be NULL",
                 L"%a:%d:Status - %r",
                 __FILE__,
-                (UINTN)__LINE__
+                (UINTN)__LINE__,
+                Status
                 );
 
   return EFI_SUCCESS;
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics2/BlackBoxTest/DriverDiagnostics2BBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics2/BlackBoxTest/DriverDiagnostics2BBTestFunction.c
index 94c0d85f..80b24b2c 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics2/BlackBoxTest/DriverDiagnostics2BBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics2/BlackBoxTest/DriverDiagnostics2BBTestFunction.c
@@ -685,10 +685,10 @@ BBTestRunDiagnosticsFuncTestCheckpoint2 (
                          AssertionType,
                          gFunctionAssertionGuid002,
                          L"Please Use Native RFC3066 which is preferable in UEFI 2.X\nEFI_DRIVER_DIAGNOSTICS2_PROTOCOL.RunDiagnostics - RunDiagnostics() returns EFI_SUCCESS with supported language",
-                         L"%a:%d: Language - %c%c%c, ControllerIndex - %d, ChildIndex - %d, ControllerName - %s, Status - %r",
+                         L"%a:%d: Language - %c%c%c%c, ControllerIndex - %d, ChildIndex - %d, ControllerName - %s, Status - %r",
                          __FILE__,
                          (UINTN)__LINE__,
-                         Lang,
+                         Lang[0],Lang[1],Lang[2],Lang[3],
                          Index,
                          ChildIndex,
                          (ControllerName == NULL) ? L"(NULL)" : ControllerName,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/EraseBlock/BlackBoxTest/EraseBlockBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/EraseBlock/BlackBoxTest/EraseBlockBBTestConformance.c
index a6156b98..c49db682 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/EraseBlock/BlackBoxTest/EraseBlockBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/EraseBlock/BlackBoxTest/EraseBlockBBTestConformance.c
@@ -193,7 +193,7 @@ BBTestEraseBlocksConformanceTest (
                      __FILE__,
                      (UINTN)__LINE__,
                      Status
-                     );      
+                     );
 
     } else {
       Status = EraseBlock->EraseBlocks(EraseBlock, MediaId + 1, 0, &Token, EraseSize);
@@ -211,7 +211,7 @@ BBTestEraseBlocksConformanceTest (
                      __FILE__,
                      (UINTN)__LINE__,
                      Status
-                     );  
+                     );
 
       Status = EraseBlock->EraseBlocks(EraseBlock, MediaId + 1, LastBlock + 1, &Token, EraseSize);
       if (Status == EFI_MEDIA_CHANGED)
@@ -228,7 +228,7 @@ BBTestEraseBlocksConformanceTest (
                      __FILE__,
                      (UINTN)__LINE__,
                      Status
-                     );  
+                     );
 
       Status = EraseBlock->EraseBlocks(EraseBlock, MediaId + 1, LastBlock - 10, &Token, EraseSize + 1);
       if (Status == EFI_MEDIA_CHANGED)
@@ -245,7 +245,7 @@ BBTestEraseBlocksConformanceTest (
                      __FILE__,
                      (UINTN)__LINE__,
                      Status
-                     );  
+                     );
 
       Status = EraseBlock->EraseBlocks(EraseBlock, MediaId, LastBlock + 1, &Token, EraseSize);
       if (Status == EFI_INVALID_PARAMETER)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/GraphicsOutput/BlackBoxTest/GraphicsOutputBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/GraphicsOutput/BlackBoxTest/GraphicsOutputBBTestFunction.c
index f1936755..edde3117 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/GraphicsOutput/BlackBoxTest/GraphicsOutputBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/GraphicsOutput/BlackBoxTest/GraphicsOutputBBTestFunction.c
@@ -172,7 +172,7 @@ Returns:
                      AssertionType,
                      gEfiGraphicsOutputQueryModeBBTestFunctionAssertionGuid,
                      L"EFI_GRAPHICS_OUTPUT_PROTOCOL.QueryMode - SetMode() then QueryMode(), compare Info structure",
-                     L"%a:%d: Status",
+                     L"%a:%d: Status - %r",
                      (UINTN) __FILE__,
                      (UINTN) (UINTN)__LINE__,
                      Status
@@ -753,7 +753,8 @@ Returns:
                      L"%a:%d:Status:%r, Expected:%r",
                      (UINTN) __FILE__,
                      (UINTN) (UINTN)__LINE__,
-                     (UINTN) Status
+                     (UINTN) Status,
+                     EFI_SUCCESS
                      );
       return Status;
     }
@@ -1474,7 +1475,8 @@ Returns:
                      L"%a:%d:Status:%r, Expected:%r",
                      (UINTN) __FILE__,
                      (UINTN) (UINTN)__LINE__,
-                     (UINTN) Status
+                     (UINTN) Status,
+                     EFI_SUCCESS
                      );
       continue;
     }
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFont/BlackBoxTest/HIIFontBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFont/BlackBoxTest/HIIFontBBTestConformance.c
index 911c4a5c..e437f002 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFont/BlackBoxTest/HIIFontBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFont/BlackBoxTest/HIIFontBBTestConformance.c
@@ -602,8 +602,7 @@ BBTestStringIdToImageConformanceTestCheckpoint1 (
                  __FILE__,
                  (UINTN)__LINE__,
                  Status
-                 );  
-
+                 );
   //
   // Call StringIdToImage with StringId not in PackageList, EFI_NOT_FOUND should be returned.
   //
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImage/BlackBoxTest/HIIImageBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImage/BlackBoxTest/HIIImageBBTestConformance.c
index 20b24bc5..7b738c69 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImage/BlackBoxTest/HIIImageBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImage/BlackBoxTest/HIIImageBBTestConformance.c
@@ -2333,7 +2333,7 @@ BBTestDrawImageIdConformanceTestCheckpoint1(
                  __FILE__,
                  (UINTN)__LINE__,
                  Status
-                 );    
+                 );
 
   //
   // Call DrawImageId with PackageList been NULL
@@ -2362,7 +2362,7 @@ BBTestDrawImageIdConformanceTestCheckpoint1(
                  __FILE__,
                  (UINTN)__LINE__,
                  Status
-                 );  
+                 );
 
   //
   // Call DrawImageId with invalid ImageId
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIString/BlackBoxTest/HIIStringBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIString/BlackBoxTest/HIIStringBBTestConformance.c
index ca9ed0b7..07ff28e1 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIString/BlackBoxTest/HIIStringBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIString/BlackBoxTest/HIIStringBBTestConformance.c
@@ -607,8 +607,7 @@ BBTestGetStringConformanceTestCheckpoint1 (
                  __FILE__,
                  (UINTN)__LINE__,
                  Status
-                 );  
-
+                 );
   //
   // Remove the PackageList from the HII database
   //
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/IPsecConfig/BlackBoxTest/IPsecConfigBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/IPsecConfig/BlackBoxTest/IPsecConfigBBTestConformance.c
index cac04b66..da910ff2 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/IPsecConfig/BlackBoxTest/IPsecConfigBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/IPsecConfig/BlackBoxTest/IPsecConfigBBTestConformance.c
@@ -693,7 +693,7 @@ BBTestGetDataConformanceTestCheckpoint3 (
                  __FILE__,
                  (UINTN)__LINE__,
                  Status
-                 );  
+                 );
 
   //
   //  Clean Environment: Call IPsec->SetData with the same DataType(0)/Selector.  
@@ -902,7 +902,7 @@ BBTestGetDataConformanceTestCheckpoint4 (
                  __FILE__,
                  (UINTN)__LINE__,
                  Status
-                 );  
+                 );
 
   //
   //  Clean Environment: Call IPsec->SetData with the same DataType(1)/Selector.  
@@ -1066,7 +1066,7 @@ BBTestGetDataConformanceTestCheckpoint4 (
                  __FILE__,
                  (UINTN)__LINE__,
                  Status
-                 );  
+                 );
 
   //
   //  Clean Environment: Call IPsec->SetData with the same DataType(1)/Selector.  
@@ -1244,7 +1244,7 @@ BBTestGetDataConformanceTestCheckpoint5 (
                  __FILE__,
                  (UINTN)__LINE__,
                  Status
-                 );  
+                 );
 
   //
   //  Clean Environment: Call IPsec->SetData with the same DataType(2)/Selector.  
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTestFunction_1.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTestFunction_1.c
index d65ece24..457a9108 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTestFunction_1.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTestFunction_1.c
@@ -4480,7 +4480,7 @@ IoWrite_Func (
       //
       //then read out the data in destination address range.
       //
-      PciIo->Io.Read (
+      Status = PciIo->Io.Read (
                   PciIo,
                   PciIoWidth,
                   BarIndex,
@@ -4508,7 +4508,8 @@ IoWrite_Func (
                      L"EFI_PCI_IO_PROTOCOL.Io.Write - the data read must equal with the data written",
                      L"%a:%d:Status - %r",
                      __FILE__,
-                     (UINTN)__LINE__
+                     (UINTN)__LINE__,
+                     Status
                      );
       //
       //write the data using EfiPciIoWidthFifoUintX.
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PxeBaseCode/BlackBoxTest/PxeBaseCodeBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PxeBaseCode/BlackBoxTest/PxeBaseCodeBBTestFunction.c
index c1ea0d49..1f2f5305 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PxeBaseCode/BlackBoxTest/PxeBaseCodeBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PxeBaseCode/BlackBoxTest/PxeBaseCodeBBTestFunction.c
@@ -1252,7 +1252,7 @@ BBTestNewStopFunctionTest (
                    __FILE__,
                    (UINTN)__LINE__,
                    Status
-                   );    
+                   );
   }
 
   //
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTestFunction.c
index ed0d8743..f269b7be 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTestFunction.c
@@ -1608,7 +1608,7 @@ BBTestReadOnlyTestCheckPoints (
                    AssertionType,
                    gReadOnlyFileSystemBBTestAssertionGuid005,
                    L"ReadOnly System: Dir SetInfo should return EFI_WRITE_PROTECTED",
-                   L"%a:%d: Status - %r",
+                   L"%a:%d: Status1 - %r Status2 - %r",
                    __FILE__,
                    (UINTN)__LINE__,
                    Status1,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemExBBTestFunction_OpenEx.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemExBBTestFunction_OpenEx.c
index ab791f34..526ad906 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemExBBTestFunction_OpenEx.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemExBBTestFunction_OpenEx.c
@@ -1155,7 +1155,7 @@ BBTestOpenExBasicTestCheckpoint1_Test1_Async (
                      EFI_TEST_ASSERTION_FAILED,
                      gSimpleFileSystemExBBTestFunctionAssertionGuid027,
                      L"OpenEx() Basic Test - checkpoint1 ----Test1----Async",
-                     L"%a:%d: Tpl - %d, Status - %r, FileName - %s",
+                     L"%a:%d: FileIoEntity->Tpl - %d, Status - %r, File Name - %s",
                      __FILE__,
                      (UINTN)__LINE__,
                      FileIoEntity->Tpl,
@@ -2152,7 +2152,7 @@ BBTestOpenExBasicTestCheckpoint1_Test3_Async (
                      EFI_TEST_ASSERTION_FAILED,
                      gSimpleFileSystemExBBTestFunctionAssertionGuid039,
                      L"OpenEx() Basic Test - checkpoint1 ---Async",
-                     L"%a:%d: Tpl - %d, Status - %r, FileName - %s",
+                     L"%a:%d: FileIoEntity->Tpl - %d,Status - %r,FileName - %s",
                      __FILE__,
                      (UINTN)__LINE__,
                      FileIoEntity->Tpl,
@@ -2656,7 +2656,7 @@ BBTestOpenExBasicTestCheckpoint1_Test4_Async (
                      EFI_TEST_ASSERTION_FAILED,
                      gSimpleFileSystemExBBTestFunctionAssertionGuid043,
                      L"OpenEx() Basic Test - checkpoint1 ---Async -- Test4----Open File",
-                     L"%a:%d: Tpl - %d, Status - %r, FileName - %s",
+                     L"%a:%d: FileIoEntity->Tpl - %d,Status - %r,FileName - %s",
                      __FILE__,
                      (UINTN)__LINE__,
                      FileIoEntity->Tpl,
@@ -3302,7 +3302,7 @@ BBTestOpenExBasicTestCheckpoint1_Test5_Async (
                      EFI_TEST_ASSERTION_FAILED,
                      gSimpleFileSystemExBBTestFunctionAssertionGuid047,
                      L"OpenEx() Basic Test - checkpoint1 ---Async -- Test5---Open File",
-                     L"%a:%d: Tpl - %d, Status - %r, FileName - %s",
+                     L"%a:%d: FileIoEntity->Tpl - %d,Status - %r,FileName - %s",
                      __FILE__,
                      (UINTN)__LINE__,
                      FileIoEntity->Tpl,
@@ -10216,7 +10216,7 @@ BBTestOpenExBasicTestCheckpoint2_Test5_Sync (
                    FileIoEntity->StatusAsync,
                    FileIoEntity->OpenMode,
                    FileIoEntity->Name
-                   ); 
+                   );
     if (FileIoEntity->OpenMode == EFI_FILE_MODE_READ){
       DirHandle2->Open (
               DirHandle2,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestConformance.c
index 09b47ee6..1b4a0d34 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestConformance.c
@@ -1945,7 +1945,7 @@ BBTestTransmitConformanceTest (
                  __FILE__,
                  (UINTN)__LINE__,
                  StatusBuf[1]
-                 );  
+                 );
 
   StandardLib->RecordAssertion (
                  StandardLib,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UFSDeviceConfig/BlackBoxTest/UFSDeviceConfigBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UFSDeviceConfig/BlackBoxTest/UFSDeviceConfigBBTestConformance.c
index 4c8f7c58..b50fc63b 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UFSDeviceConfig/BlackBoxTest/UFSDeviceConfigBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UFSDeviceConfig/BlackBoxTest/UFSDeviceConfigBBTestConformance.c
@@ -81,7 +81,7 @@ BBTestRwUfsDescriptorConfTest (
                  __FILE__,
                  (UINTN)__LINE__,
                  Status
-                 );  
+                 );
   
   Status = UFSDeviceConfig->RwUfsDescriptor(UFSDeviceConfig, TRUE, 0, 0, 0, &Descriptor, NULL);
   if (Status == EFI_INVALID_PARAMETER) 
@@ -159,7 +159,7 @@ BBTestRwUfsFlagConfTest (
                  __FILE__,
                  (UINTN)__LINE__,
                  Status
-                 );  
+                 );
   
   Status = UFSDeviceConfig->RwUfsFlag(UFSDeviceConfig, TRUE, 1, NULL);
   if (Status == EFI_INVALID_PARAMETER) 
@@ -237,7 +237,7 @@ BBTestRwUfsAttributeConfTest (
                  __FILE__,
                  (UINTN)__LINE__,
                  Status
-                 );  
+                 );
   
   Status = UFSDeviceConfig->RwUfsAttribute(UFSDeviceConfig, TRUE, 0, 0, 0, &Attribute, NULL);
   if (Status == EFI_INVALID_PARAMETER) 
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestConformance.c
index e2182c5c..fb966a87 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBoxTest/VariableServicesBBTestConformance.c
@@ -3653,8 +3653,10 @@ HardwareErrorRecordConfTest (
                      L"RT.SetVariable - Retrive the Hardware Error Record variables, check the name of them",
                      L"%a:%d:Status - %r, Expected - %r",
                      __FILE__,
-                     (UINTN)__LINE__
-                     );  
+                     (UINTN)__LINE__,
+                     Status,
+                     EFI_SUCCESS
+                     );
 
 
   if (AssertionType == EFI_TEST_ASSERTION_FAILED)
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/BlockIo2/BlackBoxTest/BlockIo2BBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/BlockIo2/BlackBoxTest/BlockIo2BBTestFunction.c
index 634246fc..21cf40f9 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/BlockIo2/BlackBoxTest/BlockIo2BBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/BlockIo2/BlackBoxTest/BlockIo2BBTestFunction.c
@@ -4688,7 +4688,8 @@ BBTestFushBlocksExFunctionAutoTestCheckpoint1(
                    __FILE__,
                    (UINTN)__LINE__,
                    4,
-                   EFI_SUCCESS
+                   EFI_SUCCESS,
+                   BlockIo2TokenBuffer[IndexI].TransactionStatus
                    );
     
     Status = gtBS->SetTimer (TimerEvent, TimerCancel, 0);
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/ComponentName2/BlackBoxTest/ComponentName2BBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/ComponentName2/BlackBoxTest/ComponentName2BBTestFunction.c
index 7b0cc6fc..000ad8f2 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/ComponentName2/BlackBoxTest/ComponentName2BBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/ComponentName2/BlackBoxTest/ComponentName2BBTestFunction.c
@@ -718,10 +718,10 @@ BBTestGetControllerNameFuncTestCheckpoint2 (
                          AssertionType,
                          gComponentName2BBTestFunctionAssertionGuid003,
                          L"Please Use Native RFC3066 which is preferable in UEFI 2.X\nCOMPONENT_NAME2_PROTOCOL.GetControllerName - GetControllerName() returns EFI_SUCCESS support language",
-                         L"%a:%d: Language - %c%c%c, ControllerIndex - %d, ChildIndex - %d, ControllerName - %s, Status - %r",
-		                 __FILE__,
+                         L"%a:%d: Language - %c%c%c%c, ControllerIndex - %d, ChildIndex - %d, ControllerName - %s, Status - %r",
+                         __FILE__,
                          (UINTN)__LINE__,
-                         Lang,
+                         Lang[0],Lang[1],Lang[2],Lang[3],
                          Index,
                          ChildIndex,
                          (ControllerName == NULL) ? L"(NULL)" : ControllerName,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/DriverDiagnostics2/BlackBoxTest/DriverDiagnostics2BBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/DriverDiagnostics2/BlackBoxTest/DriverDiagnostics2BBTestFunction.c
index 4b4988ec..3d1c6ffe 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/DriverDiagnostics2/BlackBoxTest/DriverDiagnostics2BBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/DriverDiagnostics2/BlackBoxTest/DriverDiagnostics2BBTestFunction.c
@@ -660,10 +660,10 @@ BBTestRunDiagnosticsFuncTestCheckpoint2 (
                          AssertionType,
                          gFunctionAssertionGuid002,
                          L"Please Use Native RFC3066 which is preferable in UEFI 2.X\nEFI_DRIVER_DIAGNOSTICS2_PROTOCOL.RunDiagnostics - RunDiagnostics() returns EFI_SUCCESS with supported language",
-                         L"%a:%d: Language - %c%c%c, ControllerIndex - %d, ChildIndex - %d, ControllerName - %s, Status - %r",
+                         L"%a:%d: Language - %c%c%c%c, ControllerIndex - %d, ChildIndex - %d, ControllerName - %s, Status - %r",
                          __FILE__,
                          (UINTN)__LINE__,
-                         Lang,
+                         Lang[0],Lang[1],Lang[2],Lang[3],
                          Index,
                          ChildIndex,
                          (ControllerName == NULL) ? L"(NULL)" : ControllerName,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/GraphicsOutput/BlackBoxTest/GraphicsOutputBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/GraphicsOutput/BlackBoxTest/GraphicsOutputBBTestFunction.c
index d182ea69..9c3d2bad 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/GraphicsOutput/BlackBoxTest/GraphicsOutputBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/GraphicsOutput/BlackBoxTest/GraphicsOutputBBTestFunction.c
@@ -171,7 +171,7 @@ Returns:
                      AssertionType,
                      gEfiGraphicsOutputQueryModeBBTestFunctionAssertionGuid,
                      L"EFI_GRAPHICS_OUTPUT_PROTOCOL.QueryMode - SetMode() then QueryMode(), compare Info structure",
-                     L"%a:%d: Status",
+                     L"%a:%d: Status - %r",
                      (UINTN) __FILE__,
                      (UINTN) (UINTN)__LINE__,
                      Status
@@ -752,7 +752,8 @@ Returns:
                      L"%a:%d:Status:%r, Expected:%r",
                      (UINTN) __FILE__,
                      (UINTN) (UINTN)__LINE__,
-                     (UINTN) Status
+                     (UINTN) Status,
+                     EFI_SUCCESS
                      );
       return Status;
     }
@@ -1473,7 +1474,8 @@ Returns:
                      L"%a:%d:Status:%r, Expected:%r",
                      (UINTN) __FILE__,
                      (UINTN) (UINTN)__LINE__,
-                     (UINTN) Status
+                     (UINTN) Status,
+                     EFI_SUCCESS
                      );
       continue;
     }
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/PxeBaseCode/BlackBoxTest/PxeBaseCodeBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/PxeBaseCode/BlackBoxTest/PxeBaseCodeBBTestFunction.c
index 27994144..51ac332c 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/PxeBaseCode/BlackBoxTest/PxeBaseCodeBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/PxeBaseCode/BlackBoxTest/PxeBaseCodeBBTestFunction.c
@@ -1252,7 +1252,7 @@ BBTestNewStopFunctionTest (
                    __FILE__,
                    (UINTN)__LINE__,
                    Status
-                   );    
+                   );
   }
 
   //
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTestFunction.c
index ed0d8743..21629c76 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTestFunction.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemBBTestFunction.c
@@ -1608,7 +1608,7 @@ BBTestReadOnlyTestCheckPoints (
                    AssertionType,
                    gReadOnlyFileSystemBBTestAssertionGuid005,
                    L"ReadOnly System: Dir SetInfo should return EFI_WRITE_PROTECTED",
-                   L"%a:%d: Status - %r",
+                   L"%a:%d: Status1 - %r, Status2 - %r",
                    __FILE__,
                    (UINTN)__LINE__,
                    Status1,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemExBBTestFunction_OpenEx.c b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemExBBTestFunction_OpenEx.c
index 9dd1c845..aaa34ef9 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemExBBTestFunction_OpenEx.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleFileSystem/BlackBoxTest/SimpleFileSystemExBBTestFunction_OpenEx.c
@@ -1155,7 +1155,7 @@ BBTestOpenExBasicTestCheckpoint1_Test1_Async (
                      EFI_TEST_ASSERTION_FAILED,
                      gSimpleFileSystemExBBTestFunctionAssertionGuid027,
                      L"OpenEx() Basic Test - checkpoint1 ----Test1----Async",
-                     L"%a:%d: Tpl - %d, Status - %r, FileName - %s",
+                     L"%a:%d: FileIoEntity->Tpl - %d, Status - %r, File Name - %",
                      __FILE__,
                      (UINTN)__LINE__,
                      FileIoEntity->Tpl,
@@ -2152,7 +2152,7 @@ BBTestOpenExBasicTestCheckpoint1_Test3_Async (
                      EFI_TEST_ASSERTION_FAILED,
                      gSimpleFileSystemExBBTestFunctionAssertionGuid039,
                      L"OpenEx() Basic Test - checkpoint1 ---Async",
-                     L"%a:%d: Tpl - %d, Status - %r, FileName - %s",
+                     L"%a:%d: FileIoEntity->Tpl - %d,Status - %r,FileName - %s",
                      __FILE__,
                      (UINTN)__LINE__,
                      FileIoEntity->Tpl,
@@ -2656,7 +2656,7 @@ BBTestOpenExBasicTestCheckpoint1_Test4_Async (
                      EFI_TEST_ASSERTION_FAILED,
                      gSimpleFileSystemExBBTestFunctionAssertionGuid043,
                      L"OpenEx() Basic Test - checkpoint1 ---Async -- Test4----Open File",
-                     L"%a:%d: Tpl - %d, Status - %r, FileName - %s",
+                     L"%a:%d: FileIoEntity->Tpl - %d,Status - %r,FileName - %s",
                      __FILE__,
                      (UINTN)__LINE__,
                      FileIoEntity->Tpl,
@@ -3302,7 +3302,7 @@ BBTestOpenExBasicTestCheckpoint1_Test5_Async (
                      EFI_TEST_ASSERTION_FAILED,
                      gSimpleFileSystemExBBTestFunctionAssertionGuid047,
                      L"OpenEx() Basic Test - checkpoint1 ---Async -- Test5---Open File",
-                     L"%a:%d: Tpl - %d, Status - %r, FileName - %s",
+                     L"%a:%d: FileIoEntity->Tpl - %d,Status - %r,FileName - %s",
                      __FILE__,
                      (UINTN)__LINE__,
                      FileIoEntity->Tpl,
@@ -10216,7 +10216,7 @@ BBTestOpenExBasicTestCheckpoint2_Test5_Sync (
                    FileIoEntity->StatusAsync,
                    FileIoEntity->OpenMode,
                    FileIoEntity->Name
-                   ); 
+                   );
     if (FileIoEntity->OpenMode == EFI_FILE_MODE_READ){
       DirHandle2->Open (
               DirHandle2,
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestConformance.c
index 682076ea..175fe11e 100644
--- a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestConformance.c
+++ b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestConformance.c
@@ -1945,7 +1945,7 @@ BBTestTransmitConformanceTest (
                  __FILE__,
                  (UINTN)__LINE__,
                  StatusBuf[1]
-                 );  
+                 );
 
   StandardLib->RecordAssertion (
                  StandardLib,
-- 
2.26.2.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#68636): https://edk2.groups.io/g/devel/message/68636
Mute This Topic: https://groups.io/mt/78849743/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH] [edk2-devel] RecordAssertion function parameter issue.

Posted by G Edhaya Chandran 2 years, 7 months ago

Reviewed-by: G Edhaya Chandran<edhaya.chandran@arm.com>

These are very good finds, ArvinX


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#80294): https://edk2.groups.io/g/devel/message/80294
Mute This Topic: https://groups.io/mt/78849743/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

回复: [PATCH] [edk2-devel] RecordAssertion function parameter issue.

Posted by Gao Jie 2 years, 7 months ago

Reviewed-by: Barton Gao <gaojie@byosoft.com.cn>

Thanks
Barton

-----邮件原件-----
发件人: bounce+27952+68636+5325328+9289841@groups.io
<bounce+27952+68636+5325328+9289841@groups.io> 代表 Chen, ArvinX
发送时间: 2020年12月10日 16:01
收件人: devel@edk2.groups.io
抄送: G Edhaya Chandran <Edhaya.Chandran@arm.com>; Samer El-Haj-Mahmoud
<Samer.El-Haj-Mahmoud@arm.com>; Eric Jin <eric.jin@intel.com>; Heinrich
Schuchardt <xypron.glpk@gmx.de>
主题: [PATCH] [edk2-devel] RecordAssertion function parameter issue.

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3082

Correct "RecordAssertion" argument issue to make SCT tool more stable.

Cc: G Edhaya Chandran <Edhaya.Chandran@arm.com>
Cc: Samer El-Haj-Mahmoud <Samer.El-Haj-Mahmoud@arm.com>
Cc: Eric Jin <eric.jin@intel.com>
Cc: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: ArvinX Chen <arvinx.chen@intel.com>
---
 .../ProtocolHandlerBBTestFunction_3.c             |  8 +++-----
 .../EfiCompliantBBTestPlatform_uefi.c             |  2 +-
 .../AcpiTableProtocolBBTestFunction.c             |  2 +-
 .../BlackBoxTest/BlockIo2BBTestFunction.c         |  3 ++-
 .../BlackBoxTest/ComponentName2BBTestFunction.c   |  6 +++---
 .../DevicePathFromTextBBTestCoverage.c            |  5 +++--
 .../DevicePathUtilitiesBBTestConformance.c        | 15 ++++++++++-----
 .../DriverDiagnostics2BBTestFunction.c            |  4 ++--
 .../BlackBoxTest/EraseBlockBBTestConformance.c    |  8 ++++----
 .../BlackBoxTest/GraphicsOutputBBTestFunction.c   |  8 +++++---
 .../BlackBoxTest/HIIFontBBTestConformance.c       |  3 +--
 .../BlackBoxTest/HIIImageBBTestConformance.c      |  4 ++--
 .../BlackBoxTest/HIIStringBBTestConformance.c     |  3 +--
 .../BlackBoxTest/IPsecConfigBBTestConformance.c   |  8 ++++----
 .../PciIo/BlackBoxTest/PciIoBBTestFunction_1.c    |  5 +++--
 .../BlackBoxTest/PxeBaseCodeBBTestFunction.c      |  2 +-
 .../BlackBoxTest/SimpleFileSystemBBTestFunction.c |  2 +-
 .../SimpleFileSystemExBBTestFunction_OpenEx.c     | 10 +++++-----
 .../BlackBoxTest/SimpleNetworkBBTestConformance.c |  2 +-
 .../UFSDeviceConfigBBTestConformance.c            |  6 +++---
 .../VariableServicesBBTestConformance.c           |  6 ++++--
 .../BlackBoxTest/BlockIo2BBTestFunction.c         |  3 ++-
 .../BlackBoxTest/ComponentName2BBTestFunction.c   |  6 +++---
 .../DriverDiagnostics2BBTestFunction.c            |  4 ++--
 .../BlackBoxTest/GraphicsOutputBBTestFunction.c   |  8 +++++---
 .../BlackBoxTest/PxeBaseCodeBBTestFunction.c      |  2 +-
 .../BlackBoxTest/SimpleFileSystemBBTestFunction.c |  2 +-
 .../SimpleFileSystemExBBTestFunction_OpenEx.c     | 10 +++++-----
 .../BlackBoxTest/SimpleNetworkBBTestConformance.c |  2 +-
 29 files changed, 80 insertions(+), 69 deletions(-)

diff --git
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/Bla
ckBoxTest/ProtocolHandlerBBTestFunction_3.c
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/Bla
ckBoxTest/ProtocolHandlerBBTestFunction_3.c
index 8ad31f7f..94288b23 100644
---
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/Bla
ckBoxTest/ProtocolHandlerBBTestFunction_3.c
+++
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/ProtocolHandlerServices/Bla
ckBoxTest/ProtocolHandlerBBTestFunction_3.c
@@ -11672,7 +11672,6 @@
BBTestOpenProtocolInformationInterfaceTestCheckPoint1 (
                      L"%a:%d:TPL - %d",

                      __FILE__,

                      (UINTN)__LINE__,

-                     EntryCount,

                      TplArray[Index]

                      );

       //

@@ -11825,7 +11824,6 @@
BBTestOpenProtocolInformationInterfaceTestCheckPoint1 (
                    L"%a:%d:TPL - %d",

                    __FILE__,

                    (UINTN)__LINE__,

-                   EntryCount,

                    TplArray[Index]

                    );

     //

@@ -15398,11 +15396,11 @@ BBTestConnectControllerInterfaceTestCheckPoint14 (
                    EFI_TEST_ASSERTION_FAILED,

                    gTestGenericFailureGuid,

                    L"GetPlatformOverrideDriverImages - build environment",

-                   L"%a:%d:Status - %r, NoHandles - %d",

+                   L"%a:%d:Status - %r",

                    __FILE__,

                    (UINTN)__LINE__,

                    Status

-                     );

+                   );

     goto Done;

   }

 

@@ -15699,7 +15697,7 @@ BBTestConnectControllerInterfaceTestCheckPoint15 (
                    EFI_TEST_ASSERTION_FAILED,

                    gTestGenericFailureGuid,

                    L"GetPlatformOverrideDriverImages - build environment",

-                   L"%a:%d:Status - %r, NoHandles - %d",

+                   L"%a:%d:Status - %r",

                    __FILE__,

                    (UINTN)__LINE__,

                    Status

diff --git
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCom
pliantBBTestPlatform_uefi.c
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCom
pliantBBTestPlatform_uefi.c
index 052f45b7..ffb8d8ea 100644
---
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCom
pliantBBTestPlatform_uefi.c
+++
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCom
pliantBBTestPlatform_uefi.c
@@ -1017,7 +1017,7 @@ CheckConsoleProtocols (
                  AssertionType,

                  gEfiCompliantBbTestPlatformAssertionGuid001,

                  L"UEFI Compliant - Console protocols must be implemented",

-                 L"%a:%d:Text Input - %s, Text Output - %s, Text InputEx",

+                 L"%a:%d:Text Input - %s, Text Output - %s, Text InputEx -
%s",

                  __FILE__,

                  (UINTN)__LINE__,

                  ValueA ? L"Yes" : L"No",

diff --git
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ACPITable/BlackBoxTest/AcpiTabl
eProtocolBBTestFunction.c
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ACPITable/BlackBoxTest/AcpiTabl
eProtocolBBTestFunction.c
index e1f5ccee..51ce391d 100644
---
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ACPITable/BlackBoxTest/AcpiTabl
eProtocolBBTestFunction.c
+++
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ACPITable/BlackBoxTest/AcpiTabl
eProtocolBBTestFunction.c
@@ -303,7 +303,7 @@ BBTestInstallAcpiTableFunctionTestCheckpoint1 (
                  __FILE__,

                  (UINTN)__LINE__,

                  Status

-                 ); 

+                 );

 

   if (EFI_SUCCESS == Status) {

     Status = AcpiTable->UninstallAcpiTable (

diff --git
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo2/BlackBoxTest/BlockIo2B
BTestFunction.c
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo2/BlackBoxTest/BlockIo2B
BTestFunction.c
index 8ccbfaf2..551f4671 100644
---
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo2/BlackBoxTest/BlockIo2B
BTestFunction.c
+++
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/BlockIo2/BlackBoxTest/BlockIo2B
BTestFunction.c
@@ -4686,7 +4686,8 @@ BBTestFushBlocksExFunctionAutoTestCheckpoint1(
                    __FILE__,

                    (UINTN)__LINE__,

                    4,

-                   EFI_SUCCESS

+                   EFI_SUCCESS,

+                   BlockIo2TokenBuffer[IndexI].TransactionStatus

                    );

     

     Status = gtBS->SetTimer (TimerEvent, TimerCancel, 0);

diff --git
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName2/BlackBoxTest/Com
ponentName2BBTestFunction.c
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName2/BlackBoxTest/Com
ponentName2BBTestFunction.c
index 9d5d9ffc..3b653498 100644
---
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName2/BlackBoxTest/Com
ponentName2BBTestFunction.c
+++
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/ComponentName2/BlackBoxTest/Com
ponentName2BBTestFunction.c
@@ -766,10 +766,10 @@ BBTestGetControllerNameFuncTestCheckpoint2 (
                          AssertionType,

                          gComponentName2BBTestFunctionAssertionGuid003,

                          L"Please Use Native RFC3066 which is preferable in
UEFI 2.X\nCOMPONENT_NAME2_PROTOCOL.GetControllerName - GetControllerName()
returns EFI_SUCCESS support language",

-                         L"%a:%d: Language - %c%c%c, ControllerIndex - %d,
ChildIndex - %d, ControllerName - %s, Status - %r",

-		                 __FILE__,

+                         L"%a:%d: Language - %c%c%c%c, ControllerIndex -
%d, ChildIndex - %d, ControllerName - %s, Status - %r",

+                         __FILE__,

                          (UINTN)__LINE__,

-                         Lang,

+                         Lang[0],Lang[1],Lang[2],Lang[3],

                          Index,

                          ChildIndex,

                          (ControllerName == NULL) ? L"(NULL)" :
ControllerName,

diff --git
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest
/DevicePathFromTextBBTestCoverage.c
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest
/DevicePathFromTextBBTestCoverage.c
index 5058dc4a..9a7b908a 100644
---
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest
/DevicePathFromTextBBTestCoverage.c
+++
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathFromText/BlackBoxTest
/DevicePathFromTextBBTestCoverage.c
@@ -2233,7 +2233,8 @@ DevicePathFromTextConvertTextToDeviceNodeCoverageTest
(
                 L"EFI_DEVICE_PATH_FROM_TEXT_PROTOCOL -
ConvertDeviceNodeToText must correctly recover the converting
ConvertTextToDeviceNode has acted on the device node string",

                 L"%a:%d, Convert
MemoryMapped(%d,0x123456789ABCDEF,0xFEDCBA9876543210)",

                 __FILE__,

-                (UINTN)__LINE__

+                (UINTN)__LINE__,

+                EfiMaxMemoryType

                 );

 

   //

@@ -3414,7 +3415,7 @@ DevicePathFromTextConvertTextToDeviceNodeCoverageTest
(
                 L"%a:%d, Convert SD(0)",

                 __FILE__,

                 (UINTN)__LINE__

-                );  

+                );

 

   //

   // Bluetooth(001320F5FA77) 

diff --git
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathUtilities/BlackBoxTes
t/DevicePathUtilitiesBBTestConformance.c
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathUtilities/BlackBoxTes
t/DevicePathUtilitiesBBTestConformance.c
index d8d237a6..32122a78 100644
---
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathUtilities/BlackBoxTes
t/DevicePathUtilitiesBBTestConformance.c
+++
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DevicePathUtilities/BlackBoxTes
t/DevicePathUtilitiesBBTestConformance.c
@@ -90,7 +90,8 @@ DevicePathUtilitiesCreateDeviceNodeConformanceTest (
                 L"EFI_DEVICE_PATH_UTILITIES_PROTOCOL - CreatDeviceNode
should not succeed with invalid NodeLength set",

                 L"%a:%d:Status - %r",

                 __FILE__,

-                (UINTN)__LINE__

+                (UINTN)__LINE__,

+                Status

                 );

 

   return EFI_SUCCESS;

@@ -284,7 +285,8 @@ DevicePathUtilitiesAppendDevicePathConformanceTest (
                 L"EFI_DEVICE_PATH_UTILITIES_PROTOCOL - SctAppendDevicePath
should ignore Src1 when it is set NULL",

                 L"%a:%d:Status - %r",

                 __FILE__,

-                (UINTN)__LINE__

+                (UINTN)__LINE__,

+                Status

                 );

 

   //

@@ -326,7 +328,8 @@ DevicePathUtilitiesAppendDevicePathConformanceTest (
                 L"EFI_DEVICE_PATH_UTILITIES_PROTOCOL - SctAppendDevicePath
should ignore Src2 when it is set NULL",

                 L"%a:%d:Status - %r",

                 __FILE__,

-                (UINTN)__LINE__

+                (UINTN)__LINE__,

+                Status

                 );

 

   pDevicePath1    = DevicePathUtilities->AppendDevicePath (NULL, NULL);

@@ -417,7 +420,8 @@
DevicePathUtilitiesAppendDevicePathInstanceConformanceTest (
                 L"EFI_DEVICE_PATH_UTILITIES_PROTOCOL -
AppendDevicePathInstance should not succeed with DevicePathInstance set to
be NULL",

                 L"%a:%d:Status - %r",

                 __FILE__,

-                (UINTN)__LINE__

+                (UINTN)__LINE__,

+                Status

                 );

 

   return EFI_SUCCESS;

@@ -473,7 +477,8 @@
DevicePathUtilitiesGetNextDevicePathInstanceConformanceTest (
                 L"EFI_DEVICE_PATH_UTILITIES_PROTOCOL -
GetNextDevicePathInstance should not succeed with DevicePathInstance set to
be NULL",

                 L"%a:%d:Status - %r",

                 __FILE__,

-                (UINTN)__LINE__

+                (UINTN)__LINE__,

+                Status

                 );

 

   return EFI_SUCCESS;

diff --git
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics2/BlackBoxTest
/DriverDiagnostics2BBTestFunction.c
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics2/BlackBoxTest
/DriverDiagnostics2BBTestFunction.c
index 94c0d85f..80b24b2c 100644
---
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics2/BlackBoxTest
/DriverDiagnostics2BBTestFunction.c
+++
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DriverDiagnostics2/BlackBoxTest
/DriverDiagnostics2BBTestFunction.c
@@ -685,10 +685,10 @@ BBTestRunDiagnosticsFuncTestCheckpoint2 (
                          AssertionType,

                          gFunctionAssertionGuid002,

                          L"Please Use Native RFC3066 which is preferable in
UEFI 2.X\nEFI_DRIVER_DIAGNOSTICS2_PROTOCOL.RunDiagnostics - RunDiagnostics()
returns EFI_SUCCESS with supported language",

-                         L"%a:%d: Language - %c%c%c, ControllerIndex - %d,
ChildIndex - %d, ControllerName - %s, Status - %r",

+                         L"%a:%d: Language - %c%c%c%c, ControllerIndex -
%d, ChildIndex - %d, ControllerName - %s, Status - %r",

                          __FILE__,

                          (UINTN)__LINE__,

-                         Lang,

+                         Lang[0],Lang[1],Lang[2],Lang[3],

                          Index,

                          ChildIndex,

                          (ControllerName == NULL) ? L"(NULL)" :
ControllerName,

diff --git
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/EraseBlock/BlackBoxTest/EraseBl
ockBBTestConformance.c
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/EraseBlock/BlackBoxTest/EraseBl
ockBBTestConformance.c
index a6156b98..c49db682 100644
---
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/EraseBlock/BlackBoxTest/EraseBl
ockBBTestConformance.c
+++
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/EraseBlock/BlackBoxTest/EraseBl
ockBBTestConformance.c
@@ -193,7 +193,7 @@ BBTestEraseBlocksConformanceTest (
                      __FILE__,

                      (UINTN)__LINE__,

                      Status

-                     );      

+                     );

 

     } else {

       Status = EraseBlock->EraseBlocks(EraseBlock, MediaId + 1, 0, &Token,
EraseSize);

@@ -211,7 +211,7 @@ BBTestEraseBlocksConformanceTest (
                      __FILE__,

                      (UINTN)__LINE__,

                      Status

-                     );  

+                     );

 

       Status = EraseBlock->EraseBlocks(EraseBlock, MediaId + 1, LastBlock +
1, &Token, EraseSize);

       if (Status == EFI_MEDIA_CHANGED)

@@ -228,7 +228,7 @@ BBTestEraseBlocksConformanceTest (
                      __FILE__,

                      (UINTN)__LINE__,

                      Status

-                     );  

+                     );

 

       Status = EraseBlock->EraseBlocks(EraseBlock, MediaId + 1, LastBlock -
10, &Token, EraseSize + 1);

       if (Status == EFI_MEDIA_CHANGED)

@@ -245,7 +245,7 @@ BBTestEraseBlocksConformanceTest (
                      __FILE__,

                      (UINTN)__LINE__,

                      Status

-                     );  

+                     );

 

       Status = EraseBlock->EraseBlocks(EraseBlock, MediaId, LastBlock + 1,
&Token, EraseSize);

       if (Status == EFI_INVALID_PARAMETER)

diff --git
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/GraphicsOutput/BlackBoxTest/Gra
phicsOutputBBTestFunction.c
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/GraphicsOutput/BlackBoxTest/Gra
phicsOutputBBTestFunction.c
index f1936755..edde3117 100644
---
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/GraphicsOutput/BlackBoxTest/Gra
phicsOutputBBTestFunction.c
+++
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/GraphicsOutput/BlackBoxTest/Gra
phicsOutputBBTestFunction.c
@@ -172,7 +172,7 @@ Returns:
                      AssertionType,

 
gEfiGraphicsOutputQueryModeBBTestFunctionAssertionGuid,

                      L"EFI_GRAPHICS_OUTPUT_PROTOCOL.QueryMode - SetMode()
then QueryMode(), compare Info structure",

-                     L"%a:%d: Status",

+                     L"%a:%d: Status - %r",

                      (UINTN) __FILE__,

                      (UINTN) (UINTN)__LINE__,

                      Status

@@ -753,7 +753,8 @@ Returns:
                      L"%a:%d:Status:%r, Expected:%r",

                      (UINTN) __FILE__,

                      (UINTN) (UINTN)__LINE__,

-                     (UINTN) Status

+                     (UINTN) Status,

+                     EFI_SUCCESS

                      );

       return Status;

     }

@@ -1474,7 +1475,8 @@ Returns:
                      L"%a:%d:Status:%r, Expected:%r",

                      (UINTN) __FILE__,

                      (UINTN) (UINTN)__LINE__,

-                     (UINTN) Status

+                     (UINTN) Status,

+                     EFI_SUCCESS

                      );

       continue;

     }

diff --git
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFont/BlackBoxTest/HIIFontBBT
estConformance.c
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFont/BlackBoxTest/HIIFontBBT
estConformance.c
index 911c4a5c..e437f002 100644
---
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFont/BlackBoxTest/HIIFontBBT
estConformance.c
+++
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIFont/BlackBoxTest/HIIFontBBT
estConformance.c
@@ -602,8 +602,7 @@ BBTestStringIdToImageConformanceTestCheckpoint1 (
                  __FILE__,

                  (UINTN)__LINE__,

                  Status

-                 );  

-

+                 );

   //

   // Call StringIdToImage with StringId not in PackageList, EFI_NOT_FOUND
should be returned.

   //

diff --git
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImage/BlackBoxTest/HIIImageB
BTestConformance.c
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImage/BlackBoxTest/HIIImageB
BTestConformance.c
index 20b24bc5..7b738c69 100644
---
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImage/BlackBoxTest/HIIImageB
BTestConformance.c
+++
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIImage/BlackBoxTest/HIIImageB
BTestConformance.c
@@ -2333,7 +2333,7 @@ BBTestDrawImageIdConformanceTestCheckpoint1(
                  __FILE__,

                  (UINTN)__LINE__,

                  Status

-                 );    

+                 );

 

   //

   // Call DrawImageId with PackageList been NULL

@@ -2362,7 +2362,7 @@ BBTestDrawImageIdConformanceTestCheckpoint1(
                  __FILE__,

                  (UINTN)__LINE__,

                  Status

-                 );  

+                 );

 

   //

   // Call DrawImageId with invalid ImageId

diff --git
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIString/BlackBoxTest/HIIStrin
gBBTestConformance.c
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIString/BlackBoxTest/HIIStrin
gBBTestConformance.c
index ca9ed0b7..07ff28e1 100644
---
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIString/BlackBoxTest/HIIStrin
gBBTestConformance.c
+++
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/HIIString/BlackBoxTest/HIIStrin
gBBTestConformance.c
@@ -607,8 +607,7 @@ BBTestGetStringConformanceTestCheckpoint1 (
                  __FILE__,

                  (UINTN)__LINE__,

                  Status

-                 );  

-

+                 );

   //

   // Remove the PackageList from the HII database

   //

diff --git
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/IPsecConfig/BlackBoxTest/IPsecC
onfigBBTestConformance.c
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/IPsecConfig/BlackBoxTest/IPsecC
onfigBBTestConformance.c
index cac04b66..da910ff2 100644
---
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/IPsecConfig/BlackBoxTest/IPsecC
onfigBBTestConformance.c
+++
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/IPsecConfig/BlackBoxTest/IPsecC
onfigBBTestConformance.c
@@ -693,7 +693,7 @@ BBTestGetDataConformanceTestCheckpoint3 (
                  __FILE__,

                  (UINTN)__LINE__,

                  Status

-                 );  

+                 );

 

   //

   //  Clean Environment: Call IPsec->SetData with the same
DataType(0)/Selector.  

@@ -902,7 +902,7 @@ BBTestGetDataConformanceTestCheckpoint4 (
                  __FILE__,

                  (UINTN)__LINE__,

                  Status

-                 );  

+                 );

 

   //

   //  Clean Environment: Call IPsec->SetData with the same
DataType(1)/Selector.  

@@ -1066,7 +1066,7 @@ BBTestGetDataConformanceTestCheckpoint4 (
                  __FILE__,

                  (UINTN)__LINE__,

                  Status

-                 );  

+                 );

 

   //

   //  Clean Environment: Call IPsec->SetData with the same
DataType(1)/Selector.  

@@ -1244,7 +1244,7 @@ BBTestGetDataConformanceTestCheckpoint5 (
                  __FILE__,

                  (UINTN)__LINE__,

                  Status

-                 );  

+                 );

 

   //

   //  Clean Environment: Call IPsec->SetData with the same
DataType(2)/Selector.  

diff --git
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTestF
unction_1.c
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTestF
unction_1.c
index d65ece24..457a9108 100644
---
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTestF
unction_1.c
+++
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PciIo/BlackBoxTest/PciIoBBTestF
unction_1.c
@@ -4480,7 +4480,7 @@ IoWrite_Func (
       //

       //then read out the data in destination address range.

       //

-      PciIo->Io.Read (

+      Status = PciIo->Io.Read (

                   PciIo,

                   PciIoWidth,

                   BarIndex,

@@ -4508,7 +4508,8 @@ IoWrite_Func (
                      L"EFI_PCI_IO_PROTOCOL.Io.Write - the data read must
equal with the data written",

                      L"%a:%d:Status - %r",

                      __FILE__,

-                     (UINTN)__LINE__

+                     (UINTN)__LINE__,

+                     Status

                      );

       //

       //write the data using EfiPciIoWidthFifoUintX.

diff --git
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PxeBaseCode/BlackBoxTest/PxeBas
eCodeBBTestFunction.c
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PxeBaseCode/BlackBoxTest/PxeBas
eCodeBBTestFunction.c
index c1ea0d49..1f2f5305 100644
---
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PxeBaseCode/BlackBoxTest/PxeBas
eCodeBBTestFunction.c
+++
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PxeBaseCode/BlackBoxTest/PxeBas
eCodeBBTestFunction.c
@@ -1252,7 +1252,7 @@ BBTestNewStopFunctionTest (
                    __FILE__,

                    (UINTN)__LINE__,

                    Status

-                   );    

+                   );

   }

 

   //

diff --git
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/S
impleFileSystemBBTestFunction.c
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/S
impleFileSystemBBTestFunction.c
index ed0d8743..f269b7be 100644
---
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/S
impleFileSystemBBTestFunction.c
+++
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/S
impleFileSystemBBTestFunction.c
@@ -1608,7 +1608,7 @@ BBTestReadOnlyTestCheckPoints (
                    AssertionType,

                    gReadOnlyFileSystemBBTestAssertionGuid005,

                    L"ReadOnly System: Dir SetInfo should return
EFI_WRITE_PROTECTED",

-                   L"%a:%d: Status - %r",

+                   L"%a:%d: Status1 - %r Status2 - %r",

                    __FILE__,

                    (UINTN)__LINE__,

                    Status1,

diff --git
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/S
impleFileSystemExBBTestFunction_OpenEx.c
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/S
impleFileSystemExBBTestFunction_OpenEx.c
index ab791f34..526ad906 100644
---
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/S
impleFileSystemExBBTestFunction_OpenEx.c
+++
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleFileSystem/BlackBoxTest/S
impleFileSystemExBBTestFunction_OpenEx.c
@@ -1155,7 +1155,7 @@ BBTestOpenExBasicTestCheckpoint1_Test1_Async (
                      EFI_TEST_ASSERTION_FAILED,

                      gSimpleFileSystemExBBTestFunctionAssertionGuid027,

                      L"OpenEx() Basic Test - checkpoint1
----Test1----Async",

-                     L"%a:%d: Tpl - %d, Status - %r, FileName - %s",
+                     L"%a:%d: FileIoEntity->Tpl - %d, Status - %r, File
Name - %s",

                      __FILE__,

                      (UINTN)__LINE__,

                      FileIoEntity->Tpl,

@@ -2152,7 +2152,7 @@ BBTestOpenExBasicTestCheckpoint1_Test3_Async (
                      EFI_TEST_ASSERTION_FAILED,

                      gSimpleFileSystemExBBTestFunctionAssertionGuid039,

                      L"OpenEx() Basic Test - checkpoint1 ---Async",

-                     L"%a:%d: Tpl - %d, Status - %r, FileName - %s",
+                     L"%a:%d: FileIoEntity->Tpl - %d,Status - %r,FileName -
%s",

                      __FILE__,

                      (UINTN)__LINE__,

                      FileIoEntity->Tpl,

@@ -2656,7 +2656,7 @@ BBTestOpenExBasicTestCheckpoint1_Test4_Async (
                      EFI_TEST_ASSERTION_FAILED,

                      gSimpleFileSystemExBBTestFunctionAssertionGuid043,

                      L"OpenEx() Basic Test - checkpoint1 ---Async --
Test4----Open File",

-                     L"%a:%d: Tpl - %d, Status - %r, FileName - %s",
+                     L"%a:%d: FileIoEntity->Tpl - %d,Status - %r,FileName -
%s",

                      __FILE__,

                      (UINTN)__LINE__,

                      FileIoEntity->Tpl,

@@ -3302,7 +3302,7 @@ BBTestOpenExBasicTestCheckpoint1_Test5_Async (
                      EFI_TEST_ASSERTION_FAILED,

                      gSimpleFileSystemExBBTestFunctionAssertionGuid047,

                      L"OpenEx() Basic Test - checkpoint1 ---Async --
Test5---Open File",

-                     L"%a:%d: Tpl - %d, Status - %r, FileName - %s",
+                     L"%a:%d: FileIoEntity->Tpl - %d,Status - %r,FileName -
%s",

                      __FILE__,

                      (UINTN)__LINE__,

                      FileIoEntity->Tpl,

@@ -10216,7 +10216,7 @@ BBTestOpenExBasicTestCheckpoint2_Test5_Sync (
                    FileIoEntity->StatusAsync,

                    FileIoEntity->OpenMode,

                    FileIoEntity->Name

-                   ); 

+                   );

     if (FileIoEntity->OpenMode == EFI_FILE_MODE_READ){

       DirHandle2->Open (

               DirHandle2,

diff --git
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest/Simp
leNetworkBBTestConformance.c
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest/Simp
leNetworkBBTestConformance.c
index 09b47ee6..1b4a0d34 100644
---
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest/Simp
leNetworkBBTestConformance.c
+++
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest/Simp
leNetworkBBTestConformance.c
@@ -1945,7 +1945,7 @@ BBTestTransmitConformanceTest (
                  __FILE__,

                  (UINTN)__LINE__,

                  StatusBuf[1]

-                 );  

+                 );

 

   StandardLib->RecordAssertion (

                  StandardLib,

diff --git
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UFSDeviceConfig/BlackBoxTest/UF
SDeviceConfigBBTestConformance.c
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UFSDeviceConfig/BlackBoxTest/UF
SDeviceConfigBBTestConformance.c
index 4c8f7c58..b50fc63b 100644
---
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UFSDeviceConfig/BlackBoxTest/UF
SDeviceConfigBBTestConformance.c
+++
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UFSDeviceConfig/BlackBoxTest/UF
SDeviceConfigBBTestConformance.c
@@ -81,7 +81,7 @@ BBTestRwUfsDescriptorConfTest (
                  __FILE__,

                  (UINTN)__LINE__,

                  Status

-                 );  

+                 );

   

   Status = UFSDeviceConfig->RwUfsDescriptor(UFSDeviceConfig, TRUE, 0, 0, 0,
&Descriptor, NULL);

   if (Status == EFI_INVALID_PARAMETER) 

@@ -159,7 +159,7 @@ BBTestRwUfsFlagConfTest (
                  __FILE__,

                  (UINTN)__LINE__,

                  Status

-                 );  

+                 );

   

   Status = UFSDeviceConfig->RwUfsFlag(UFSDeviceConfig, TRUE, 1, NULL);

   if (Status == EFI_INVALID_PARAMETER) 

@@ -237,7 +237,7 @@ BBTestRwUfsAttributeConfTest (
                  __FILE__,

                  (UINTN)__LINE__,

                  Status

-                 );  

+                 );

   

   Status = UFSDeviceConfig->RwUfsAttribute(UFSDeviceConfig, TRUE, 0, 0, 0,
&Attribute, NULL);

   if (Status == EFI_INVALID_PARAMETER) 

diff --git
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBo
xTest/VariableServicesBBTestConformance.c
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBo
xTest/VariableServicesBBTestConformance.c
index e2182c5c..fb966a87 100644
---
a/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBo
xTest/VariableServicesBBTestConformance.c
+++
b/uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/VariableServices/BlackBo
xTest/VariableServicesBBTestConformance.c
@@ -3653,8 +3653,10 @@ HardwareErrorRecordConfTest (
                      L"RT.SetVariable - Retrive the Hardware Error Record
variables, check the name of them",

                      L"%a:%d:Status - %r, Expected - %r",

                      __FILE__,

-                     (UINTN)__LINE__

-                     );  

+                     (UINTN)__LINE__,

+                     Status,

+                     EFI_SUCCESS

+                     );

 

 

   if (AssertionType == EFI_TEST_ASSERTION_FAILED)

diff --git
a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/BlockIo2/BlackBoxTest/BlockIo2B
BTestFunction.c
b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/BlockIo2/BlackBoxTest/BlockIo2B
BTestFunction.c
index 634246fc..21cf40f9 100644
---
a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/BlockIo2/BlackBoxTest/BlockIo2B
BTestFunction.c
+++
b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/BlockIo2/BlackBoxTest/BlockIo2B
BTestFunction.c
@@ -4688,7 +4688,8 @@ BBTestFushBlocksExFunctionAutoTestCheckpoint1(
                    __FILE__,

                    (UINTN)__LINE__,

                    4,

-                   EFI_SUCCESS

+                   EFI_SUCCESS,

+                   BlockIo2TokenBuffer[IndexI].TransactionStatus

                    );

     

     Status = gtBS->SetTimer (TimerEvent, TimerCancel, 0);

diff --git
a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/ComponentName2/BlackBoxTest/Com
ponentName2BBTestFunction.c
b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/ComponentName2/BlackBoxTest/Com
ponentName2BBTestFunction.c
index 7b0cc6fc..000ad8f2 100644
---
a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/ComponentName2/BlackBoxTest/Com
ponentName2BBTestFunction.c
+++
b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/ComponentName2/BlackBoxTest/Com
ponentName2BBTestFunction.c
@@ -718,10 +718,10 @@ BBTestGetControllerNameFuncTestCheckpoint2 (
                          AssertionType,

                          gComponentName2BBTestFunctionAssertionGuid003,

                          L"Please Use Native RFC3066 which is preferable in
UEFI 2.X\nCOMPONENT_NAME2_PROTOCOL.GetControllerName - GetControllerName()
returns EFI_SUCCESS support language",

-                         L"%a:%d: Language - %c%c%c, ControllerIndex - %d,
ChildIndex - %d, ControllerName - %s, Status - %r",

-		                 __FILE__,

+                         L"%a:%d: Language - %c%c%c%c, ControllerIndex -
%d, ChildIndex - %d, ControllerName - %s, Status - %r",

+                         __FILE__,

                          (UINTN)__LINE__,

-                         Lang,

+                         Lang[0],Lang[1],Lang[2],Lang[3],

                          Index,

                          ChildIndex,

                          (ControllerName == NULL) ? L"(NULL)" :
ControllerName,

diff --git
a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/DriverDiagnostics2/BlackBoxTest
/DriverDiagnostics2BBTestFunction.c
b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/DriverDiagnostics2/BlackBoxTest
/DriverDiagnostics2BBTestFunction.c
index 4b4988ec..3d1c6ffe 100644
---
a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/DriverDiagnostics2/BlackBoxTest
/DriverDiagnostics2BBTestFunction.c
+++
b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/DriverDiagnostics2/BlackBoxTest
/DriverDiagnostics2BBTestFunction.c
@@ -660,10 +660,10 @@ BBTestRunDiagnosticsFuncTestCheckpoint2 (
                          AssertionType,

                          gFunctionAssertionGuid002,

                          L"Please Use Native RFC3066 which is preferable in
UEFI 2.X\nEFI_DRIVER_DIAGNOSTICS2_PROTOCOL.RunDiagnostics - RunDiagnostics()
returns EFI_SUCCESS with supported language",

-                         L"%a:%d: Language - %c%c%c, ControllerIndex - %d,
ChildIndex - %d, ControllerName - %s, Status - %r",

+                         L"%a:%d: Language - %c%c%c%c, ControllerIndex -
%d, ChildIndex - %d, ControllerName - %s, Status - %r",

                          __FILE__,

                          (UINTN)__LINE__,

-                         Lang,

+                         Lang[0],Lang[1],Lang[2],Lang[3],

                          Index,

                          ChildIndex,

                          (ControllerName == NULL) ? L"(NULL)" :
ControllerName,

diff --git
a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/GraphicsOutput/BlackBoxTest/Gra
phicsOutputBBTestFunction.c
b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/GraphicsOutput/BlackBoxTest/Gra
phicsOutputBBTestFunction.c
index d182ea69..9c3d2bad 100644
---
a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/GraphicsOutput/BlackBoxTest/Gra
phicsOutputBBTestFunction.c
+++
b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/GraphicsOutput/BlackBoxTest/Gra
phicsOutputBBTestFunction.c
@@ -171,7 +171,7 @@ Returns:
                      AssertionType,

 
gEfiGraphicsOutputQueryModeBBTestFunctionAssertionGuid,

                      L"EFI_GRAPHICS_OUTPUT_PROTOCOL.QueryMode - SetMode()
then QueryMode(), compare Info structure",

-                     L"%a:%d: Status",

+                     L"%a:%d: Status - %r",

                      (UINTN) __FILE__,

                      (UINTN) (UINTN)__LINE__,

                      Status

@@ -752,7 +752,8 @@ Returns:
                      L"%a:%d:Status:%r, Expected:%r",

                      (UINTN) __FILE__,

                      (UINTN) (UINTN)__LINE__,

-                     (UINTN) Status

+                     (UINTN) Status,

+                     EFI_SUCCESS

                      );

       return Status;

     }

@@ -1473,7 +1474,8 @@ Returns:
                      L"%a:%d:Status:%r, Expected:%r",

                      (UINTN) __FILE__,

                      (UINTN) (UINTN)__LINE__,

-                     (UINTN) Status

+                     (UINTN) Status,

+                     EFI_SUCCESS

                      );

       continue;

     }

diff --git
a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/PxeBaseCode/BlackBoxTest/PxeBas
eCodeBBTestFunction.c
b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/PxeBaseCode/BlackBoxTest/PxeBas
eCodeBBTestFunction.c
index 27994144..51ac332c 100644
---
a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/PxeBaseCode/BlackBoxTest/PxeBas
eCodeBBTestFunction.c
+++
b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/PxeBaseCode/BlackBoxTest/PxeBas
eCodeBBTestFunction.c
@@ -1252,7 +1252,7 @@ BBTestNewStopFunctionTest (
                    __FILE__,

                    (UINTN)__LINE__,

                    Status

-                   );    

+                   );

   }

 

   //

diff --git
a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleFileSystem/BlackBoxTest/S
impleFileSystemBBTestFunction.c
b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleFileSystem/BlackBoxTest/S
impleFileSystemBBTestFunction.c
index ed0d8743..21629c76 100644
---
a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleFileSystem/BlackBoxTest/S
impleFileSystemBBTestFunction.c
+++
b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleFileSystem/BlackBoxTest/S
impleFileSystemBBTestFunction.c
@@ -1608,7 +1608,7 @@ BBTestReadOnlyTestCheckPoints (
                    AssertionType,

                    gReadOnlyFileSystemBBTestAssertionGuid005,

                    L"ReadOnly System: Dir SetInfo should return
EFI_WRITE_PROTECTED",

-                   L"%a:%d: Status - %r",

+                   L"%a:%d: Status1 - %r, Status2 - %r",

                    __FILE__,

                    (UINTN)__LINE__,

                    Status1,

diff --git
a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleFileSystem/BlackBoxTest/S
impleFileSystemExBBTestFunction_OpenEx.c
b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleFileSystem/BlackBoxTest/S
impleFileSystemExBBTestFunction_OpenEx.c
index 9dd1c845..aaa34ef9 100644
---
a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleFileSystem/BlackBoxTest/S
impleFileSystemExBBTestFunction_OpenEx.c
+++
b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleFileSystem/BlackBoxTest/S
impleFileSystemExBBTestFunction_OpenEx.c
@@ -1155,7 +1155,7 @@ BBTestOpenExBasicTestCheckpoint1_Test1_Async (
                      EFI_TEST_ASSERTION_FAILED,

                      gSimpleFileSystemExBBTestFunctionAssertionGuid027,

                      L"OpenEx() Basic Test - checkpoint1
----Test1----Async",

-                     L"%a:%d: Tpl - %d, Status - %r, FileName - %s",
+                     L"%a:%d: FileIoEntity->Tpl - %d, Status - %r, File
Name - %",

                      __FILE__,

                      (UINTN)__LINE__,

                      FileIoEntity->Tpl,

@@ -2152,7 +2152,7 @@ BBTestOpenExBasicTestCheckpoint1_Test3_Async (
                      EFI_TEST_ASSERTION_FAILED,

                      gSimpleFileSystemExBBTestFunctionAssertionGuid039,

                      L"OpenEx() Basic Test - checkpoint1 ---Async",

-                     L"%a:%d: Tpl - %d, Status - %r, FileName - %s",
+                     L"%a:%d: FileIoEntity->Tpl - %d,Status - %r,FileName -
%s",

                      __FILE__,

                      (UINTN)__LINE__,

                      FileIoEntity->Tpl,

@@ -2656,7 +2656,7 @@ BBTestOpenExBasicTestCheckpoint1_Test4_Async (
                      EFI_TEST_ASSERTION_FAILED,

                      gSimpleFileSystemExBBTestFunctionAssertionGuid043,

                      L"OpenEx() Basic Test - checkpoint1 ---Async --
Test4----Open File",

-                     L"%a:%d: Tpl - %d, Status - %r, FileName - %s",
+                     L"%a:%d: FileIoEntity->Tpl - %d,Status - %r,FileName -
%s",

                      __FILE__,

                      (UINTN)__LINE__,

                      FileIoEntity->Tpl,

@@ -3302,7 +3302,7 @@ BBTestOpenExBasicTestCheckpoint1_Test5_Async (
                      EFI_TEST_ASSERTION_FAILED,

                      gSimpleFileSystemExBBTestFunctionAssertionGuid047,

                      L"OpenEx() Basic Test - checkpoint1 ---Async --
Test5---Open File",

-                     L"%a:%d: Tpl - %d, Status - %r, FileName - %s",
+                     L"%a:%d: FileIoEntity->Tpl - %d,Status - %r,FileName -
%s",

                      __FILE__,

                      (UINTN)__LINE__,

                      FileIoEntity->Tpl,

@@ -10216,7 +10216,7 @@ BBTestOpenExBasicTestCheckpoint2_Test5_Sync (
                    FileIoEntity->StatusAsync,

                    FileIoEntity->OpenMode,

                    FileIoEntity->Name

-                   ); 

+                   );

     if (FileIoEntity->OpenMode == EFI_FILE_MODE_READ){

       DirHandle2->Open (

               DirHandle2,

diff --git
a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleNetwork/BlackBoxTest/Simp
leNetworkBBTestConformance.c
b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleNetwork/BlackBoxTest/Simp
leNetworkBBTestConformance.c
index 682076ea..175fe11e 100644
---
a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleNetwork/BlackBoxTest/Simp
leNetworkBBTestConformance.c
+++
b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleNetwork/BlackBoxTest/Simp
leNetworkBBTestConformance.c
@@ -1945,7 +1945,7 @@ BBTestTransmitConformanceTest (
                  __FILE__,

                  (UINTN)__LINE__,

                  StatusBuf[1]

-                 );  

+                 );

 

   StandardLib->RecordAssertion (

                  StandardLib,

-- 
2.26.2.windows.1



-=-=-=-=-=-=
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#68636): https://edk2.groups.io/g/devel/message/68636
Mute This Topic: https://groups.io/mt/78849743/5325328
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [gaojie@byosoft.com.cn]
-=-=-=-=-=-=






-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#80695): https://edk2.groups.io/g/devel/message/80695
Mute This Topic: https://groups.io/mt/85623471/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] 回复: [PATCH] [edk2-devel] RecordAssertion function parameter issue.

Posted by G Edhaya Chandran 2 years, 7 months ago

The patch is upstreamed through the commit: https://github.com/tianocore/edk2-test/commit/92a0343c1553342c53fae9d9d646b763add232c0


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#80876): https://edk2.groups.io/g/devel/message/80876
Mute This Topic: https://groups.io/mt/85623471/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-