Commit 92a0343c authored by ArvinX Chen's avatar ArvinX Chen Committed by G Edhaya Chandran
Browse files

RecordAssertion function parameter issue.

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



Correct "RecordAssertion" function 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>
Reviewed-by: default avatarBarton Gao <gaojie@byosoft.com.cn>
Reviewed-by: G Edhaya Chandran<edhaya.chandran@arm.com>
parent 1abfd7a6
......@@ -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
......
......@@ -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",
......
......@@ -303,7 +303,7 @@ BBTestInstallAcpiTableFunctionTestCheckpoint1 (
__FILE__,
(UINTN)__LINE__,
Status
);
);
if (EFI_SUCCESS == Status) {
Status = AcpiTable->UninstallAcpiTable (
......
......@@ -4686,7 +4686,8 @@ BBTestFushBlocksExFunctionAutoTestCheckpoint1(
__FILE__,
(UINTN)__LINE__,
4,
EFI_SUCCESS
EFI_SUCCESS,
BlockIo2TokenBuffer[IndexI].TransactionStatus
);
Status = gtBS->SetTimer (TimerEvent, TimerCancel, 0);
......
......@@ -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,
......
......@@ -447,7 +447,7 @@ BBTestGetDataFunctionTest (
(UINTN)__LINE__,
Status,
ProgressErr
);
);
Status = ConfigKeywordHandler->GetData (ConfigKeywordHandler, L"NAMESPACE=x-UEFI-ns&", KeywordString2, &Progress, &ProgressErr, &Results2);
if (Status != EFI_SUCCESS || ProgressErr != KEYWORD_HANDLER_NO_ERROR || Progress != KeywordString2 + SctStrLen(KeywordString2)) {
......
......@@ -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)
......
......@@ -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;
......
......@@ -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,
......
......@@ -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)
......
......@@ -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;
}
......
......@@ -602,8 +602,7 @@ BBTestStringIdToImageConformanceTestCheckpoint1 (
__FILE__,
(UINTN)__LINE__,
Status
);
);
//
// Call StringIdToImage with StringId not in PackageList, EFI_NOT_FOUND should be returned.
//
......
......@@ -646,8 +646,7 @@ BBTestStringIdToImageExConformanceTestCheckpoint1 (
__FILE__,
(UINTN)__LINE__,
Status
);
);
//
// Call StringIdToImageEx with StringId not in PackageList, EFI_NOT_FOUND should be returned.
//
......
......@@ -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
......
......@@ -2030,7 +2030,7 @@ BBTestDrawImageIdExConformanceTestCheckpoint1(
__FILE__,
(UINTN)__LINE__,
Status
);
);
//
// Call DrawImageIdEx with PackageList been NULL
......@@ -2059,7 +2059,7 @@ BBTestDrawImageIdExConformanceTestCheckpoint1(
__FILE__,
(UINTN)__LINE__,
Status
);
);
//
// Call DrawImageIdEx with invalid ImageId
......
......@@ -607,8 +607,7 @@ BBTestGetStringConformanceTestCheckpoint1 (
__FILE__,
(UINTN)__LINE__,
Status
);
);
//
// Remove the PackageList from the HII database
//
......
......@@ -299,7 +299,7 @@ BBTestHashInitConformanceTest (
__FILE__,
(UINTN)__LINE__,
Status
);
);
Status = Hash2->HashInit (Hash2, &gHashAlgorithmGuids[Index]);
......@@ -320,8 +320,7 @@ BBTestHashInitConformanceTest (
__FILE__,
(UINTN)__LINE__,
Status
);
);
}
}
......@@ -384,7 +383,7 @@ BBTestHashUpdateConformanceTest (
__FILE__,
(UINTN)__LINE__,
Status
);
);
for (Index = 0; Index < 6; Index++) {
Status = Hash2->GetHashSize (Hash2, &gHashAlgorithmGuids[Index], &HashSize);
......@@ -407,7 +406,7 @@ BBTestHashUpdateConformanceTest (
__FILE__,
(UINTN)__LINE__,
Status
);
);
Status = Hash2->HashInit (Hash2, &gHashAlgorithmGuids[Index]);
......@@ -428,8 +427,7 @@ BBTestHashUpdateConformanceTest (
__FILE__,
(UINTN)__LINE__,
Status
);
);
}
}
......@@ -492,7 +490,7 @@ BBTestHashFinalConformanceTest (
__FILE__,
(UINTN)__LINE__,
Status
);
);
for (Index = 0; Index < 6; Index++) {
Status = Hash2->GetHashSize (Hash2, &gHashAlgorithmGuids[Index], &HashSize);
......@@ -513,7 +511,7 @@ BBTestHashFinalConformanceTest (
__FILE__,
(UINTN)__LINE__,
Status
);
);
Status = Hash2->HashInit (Hash2, &gHashAlgorithmGuids[Index]);
Status = Hash2->HashUpdate (Hash2, Message, MessageSize);
......@@ -533,7 +531,7 @@ BBTestHashFinalConformanceTest (
__FILE__,
(UINTN)__LINE__,
Status
);
);
Status= Hash2->HashInit (Hash2, &gHashAlgorithmGuids[Index]);
......@@ -554,7 +552,7 @@ BBTestHashFinalConformanceTest (
__FILE__,
(UINTN)__LINE__,
Status
);
);
Status = Hash2->HashFinal (Hash2, (EFI_HASH2_OUTPUT *) Hash2Out);
Status = Hash2->HashFinal (Hash2, (EFI_HASH2_OUTPUT*) Hash2Out);;
......@@ -572,8 +570,7 @@ BBTestHashFinalConformanceTest (
__FILE__,
(UINTN)__LINE__,
Status
);
);
}
}
......
......@@ -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.
......
......@@ -405,7 +405,7 @@ BBTestPassThruConformanceTest (
__FILE__,
(UINTN)__LINE__,
EFI_UNSUPPORTED
);
);
return EFI_UNSUPPORTED;
}
......
......@@ -351,7 +351,7 @@ BBTestPassThruFunctionTest (
__FILE__,
(UINTN)__LINE__,
EFI_UNSUPPORTED
);
);
return EFI_UNSUPPORTED;
}
......@@ -390,9 +390,7 @@ BBTestPassThruFunctionTest (
__FILE__,
(UINTN)__LINE__,
Status
);
);
//
// Create Event
//
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment