public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [edk2-test][Patch] uefi-sct/SctPkg:Remove old unused files in EfiCompliant test
@ 2018-11-21  2:13 Eric Jin
  2018-11-21 14:47 ` Supreeth Venkatesh
  0 siblings, 1 reply; 2+ messages in thread
From: Eric Jin @ 2018-11-21  2:13 UTC (permalink / raw)
  To: edk2-devel

Cc: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Eric Jin <eric.jin@intel.com>
---
 .../BlackBoxTest/EfiCompliantBBTestDriver_efi.c    |   64 -
 .../BlackBoxTest/EfiCompliantBBTestMain_efi.c      |  126 --
 .../BlackBoxTest/EfiCompliantBBTestMain_efi.h      |  117 --
 .../BlackBoxTest/EfiCompliantBBTestPlatform_efi.c  | 1441 --------------------
 .../BlackBoxTest/EfiCompliantBBTestRequired_efi.c  |  820 -----------
 .../BlackBoxTest/EfiCompliantBBTestSupport_efi.c   |  390 ------
 .../BlackBoxTest/EfiCompliantBBTest_efi.inf        |   56 -
 .../Generic/EfiCompliant/BlackBoxTest/Guid_efi.c   |   65 -
 .../Generic/EfiCompliant/BlackBoxTest/Guid_efi.h   |  116 --
 9 files changed, 3195 deletions(-)
 delete mode 100644 uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestDriver_efi.c
 delete mode 100644 uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestMain_efi.c
 delete mode 100644 uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestMain_efi.h
 delete mode 100644 uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestPlatform_efi.c
 delete mode 100644 uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestRequired_efi.c
 delete mode 100644 uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestSupport_efi.c
 delete mode 100644 uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTest_efi.inf
 delete mode 100644 uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/Guid_efi.c
 delete mode 100644 uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/Guid_efi.h

diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestDriver_efi.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestDriver_efi.c
deleted file mode 100644
index 5db3eae..0000000
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestDriver_efi.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/** @file
-
-  Copyright 2006 - 2010 Unified EFI, Inc.<BR>
-  Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
-
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at 
-  http://opensource.org/licenses/bsd-license.php
- 
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
- 
-**/
-/*++
-
-Module Name:
-
-  EfiCompliantBbTestDriver.c
-
-Abstract:
-
-  Check the driver specific elements in EFI Spec.
-
---*/
-
-//
-// Includes
-//
-
-#include "SctLib.h"
-#include "EfiCompliantBbTestMain_efi.h"
-
-//
-// Module definitions
-//
-
-#define SECTION_NAME_DRIVER_SPECIFIC        L"Driver Specific"
-
-//
-// External functions implementation
-//
-
-EFI_STATUS
-DriverSpecificElementsBbTest (
-  IN EFI_BB_TEST_PROTOCOL         *This,
-  IN VOID                         *ClientInterface,
-  IN EFI_TEST_LEVEL               TestLevel,
-  IN EFI_HANDLE                   SupportHandle
-  )
-/*++
-
-Routine Description:
-
-  Check the driver specific elements, which defined in the EFI spec 1.10,
-  section 2.6.3.
-
-  We didn't find a good way to test this item. So currently it is commented in
-  the test entry point definitions of TestMain.c.
-
---*/
-{
-  return EFI_UNSUPPORTED;
-}
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestMain_efi.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestMain_efi.c
deleted file mode 100644
index 31ee6c4..0000000
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestMain_efi.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/** @file
-
-  Copyright 2006 - 2010 Unified EFI, Inc.<BR>
-  Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
-
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at 
-  http://opensource.org/licenses/bsd-license.php
- 
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
- 
-**/
-/*++
-
-Module Name:
-
-  EfiCompliantBbTestMain.c
-
-Abstract:
-
-  EFI Compliant Black-Box Test.
-
---*/
-
-#include "SctLib.h"
-#include "EfiCompliantBbTestMain_efi.h"
-
-//
-// Global variables
-//
-
-EFI_BB_TEST_PROTOCOL_FIELD gBBTestProtocolField = {
-  EFI_COMPLIANT_BB_TEST_REVISION,
-  EFI_COMPLIANT_BB_TEST_GUID,
-  L"EFI Compliant Test",
-  L"UEFI 2.0 Compliant Black-Box Test"
-};
-
-EFI_GUID gSupportProtocolGuid[] = {
-  EFI_STANDARD_TEST_LIBRARY_GUID,
-  EFI_TEST_PROFILE_LIBRARY_GUID,
-  EFI_NULL_GUID
-};
-
-EFI_BB_TEST_ENTRY_FIELD gBBTestEntryField[] = {
-  {
-    REQUIRED_ELEMENTS_BB_TEST_GUID,
-    L"Required Elements",
-    L"Check the required elements defined in the EFI spec 2.6.1",
-    EFI_TEST_LEVEL_DEFAULT,
-    gSupportProtocolGuid,
-    EFI_TEST_CASE_AUTO,
-    RequiredElementsBbTest
-  },
-  {
-    PLATFORM_SPECIFIC_ELEMENTS_BB_TEST_GUID,
-    L"Platform Specific Elements",
-    L"Check the platform specific elements defined in the EFI spec 2.6.2",
-    EFI_TEST_LEVEL_DEFAULT,
-    gSupportProtocolGuid,
-    EFI_TEST_CASE_AUTO,
-    PlatformSpecificElementsBbTest
-  },
-  //
-  // NOTE: We didn't find a good way to check the driver specific elements
-  // defined in the EFI spec 2.6.3.
-  //
-  /*
-  {
-    DRIVER_SPECIFIC_ELEMENTS_BB_TEST_GUID,
-    L"Driver Specific Elements",
-    L"Check the driver specific elements defined in the EFI spec 2.6.3",
-    EFI_TEST_LEVEL_DEFAULT,
-    gSupportProtocolGuid,
-    EFI_TEST_CASE_AUTO,
-    DriverSpecificElementsBbTest
-  },
-  */
-  EFI_NULL_GUID
-};
-
-EFI_BB_TEST_PROTOCOL *gBBTestProtocolInterface;
-
-//
-// Unload function declaration
-//
-
-EFI_STATUS
-EfiCompliantBbTestUnload (
-  IN EFI_HANDLE         ImageHandle
-  );
-
-//
-// Entry point
-//
-
-EFI_STATUS
-InitializeEfiCompliantBbTest (
-  IN EFI_HANDLE         ImageHandle,
-  IN EFI_SYSTEM_TABLE   *SystemTable
-  )
-{
-  EfiInitializeTestLib (ImageHandle, SystemTable);
-  SctInitializeLib (ImageHandle, SystemTable);
-
-  return EfiInitAndInstallBBTestInterface (
-           &ImageHandle,
-           &gBBTestProtocolField,
-           gBBTestEntryField,
-           EfiCompliantBbTestUnload,
-           &gBBTestProtocolInterface
-           );
-}
-
-EFI_STATUS
-EfiCompliantBbTestUnload (
-  IN EFI_HANDLE         ImageHandle
-  )
-{
-  return EfiUninstallAndFreeBBTestInterface (
-           ImageHandle,
-           gBBTestProtocolInterface
-           );
-}
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestMain_efi.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestMain_efi.h
deleted file mode 100644
index 287af47..0000000
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestMain_efi.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/** @file
-
-  Copyright 2006 - 2016 Unified EFI, Inc.<BR>
-  Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>
-
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at 
-  http://opensource.org/licenses/bsd-license.php
- 
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
- 
-**/
-/*++
-
-Module Name:
-
-  EfiCompliantBbTestMain.h
-
-Abstract:
-
-  EFI Compliant Black-Box Test.
-
---*/
-
-#ifndef _EFI_COMPLIANT_BB_TEST_MAIN_H_
-#define _EFI_COMPLIANT_BB_TEST_MAIN_H_
-
-//
-// Includes
-//
-
-#include "SctLib.h"
-#include <Library/EfiTestLib.h>
-#include "Guid_efi.h"
-
-#include EFI_TEST_PROTOCOL_DEFINITION (BbTest)
-#include EFI_TEST_PROTOCOL_DEFINITION (StandardTestLibrary)
-#include EFI_TEST_PROTOCOL_DEFINITION (TestProfileLibrary)
-
-//
-// Definitions
-//
-
-#define EFI_COMPLIANT_BB_TEST_REVISION      0x00010001
-
-// {4796995E-528F-4e7e-8BAF-FA4A931D2502}
-#define EFI_COMPLIANT_BB_TEST_GUID          \
-  { 0x4796995e, 0x528f, 0x4e7e, {0x8b, 0xaf, 0xfa, 0x4a, 0x93, 0x1d, 0x25, 0x02 }}
-
-#define EFI_COMPLIANT_BB_TEST_INI_PATH      L"Dependency\\EfiCompliantBBTest"
-#define EFI_COMPLIANT_BB_TEST_INI_FILE      L"EfiCompliant.Ini"
-
-//
-// Prototype of conformance tests
-//
-
-EFI_STATUS
-RequiredElementsBbTest (
-  IN EFI_BB_TEST_PROTOCOL         *This,
-  IN VOID                         *ClientInterface,
-  IN EFI_TEST_LEVEL               TestLevel,
-  IN EFI_HANDLE                   SupportHandle
-  );
-
-EFI_STATUS
-PlatformSpecificElementsBbTest (
-  IN EFI_BB_TEST_PROTOCOL         *This,
-  IN VOID                         *ClientInterface,
-  IN EFI_TEST_LEVEL               TestLevel,
-  IN EFI_HANDLE                   SupportHandle
-  );
-
-EFI_STATUS
-DriverSpecificElementsBbTest (
-  IN EFI_BB_TEST_PROTOCOL         *This,
-  IN VOID                         *ClientInterface,
-  IN EFI_TEST_LEVEL               TestLevel,
-  IN EFI_HANDLE                   SupportHandle
-  );
-
-//
-// Support services
-//
-
-EFI_STATUS
-OpenIniFile (
-  IN  EFI_TEST_PROFILE_LIBRARY_PROTOCOL   *ProfileLib,
-  IN  CHAR16                              *IniPathName,
-  IN  CHAR16                              *IniFileName,
-  OUT EFI_INI_FILE_HANDLE                 *IniFile
-  );
-
-EFI_STATUS
-CloseIniFile (
-  IN  EFI_TEST_PROFILE_LIBRARY_PROTOCOL   *ProfileLib,
-  IN  EFI_INI_FILE_HANDLE                 IniFile
-  );
-
-//
-// GUIDs for the test entry points
-//
-
-// {117C9ABC-489D-4504-ACDB-12AACE8F505B}
-#define REQUIRED_ELEMENTS_BB_TEST_GUID                \
-  { 0x117c9abc, 0x489d, 0x4504, {0xac, 0xdb, 0x12, 0xaa, 0xce, 0x8f, 0x50, 0x5b }}
-
-// {A0A8BED3-3D6F-4ad8-907A-84D52EE1543B}
-#define PLATFORM_SPECIFIC_ELEMENTS_BB_TEST_GUID       \
-  { 0xa0a8bed3, 0x3d6f, 0x4ad8, {0x90, 0x7a, 0x84, 0xd5, 0x2e, 0xe1, 0x54, 0x3b }}
-
-// {EED18069-2B1F-47c0-9C3C-20D5B070B84C}
-#define DRIVER_SPECIFIC_ELEMENTS_BB_TEST_GUID         \
-  { 0xeed18069, 0x2b1f, 0x47c0, {0x9c, 0x3c, 0x20, 0xd5, 0xb0, 0x70, 0xb8, 0x4c }}
-
-#endif
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestPlatform_efi.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestPlatform_efi.c
deleted file mode 100644
index 5cd541c..0000000
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestPlatform_efi.c
+++ /dev/null
@@ -1,1441 +0,0 @@
-/** @file
-
-  Copyright 2006 - 2016 Unified EFI, Inc.<BR>
-  Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>
-
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at 
-  http://opensource.org/licenses/bsd-license.php
- 
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
- 
-**/
-/*++
-
-Module Name:
-
-  EfiCompliantBbTestPlatform.c
-
-Abstract:
-
-  Check the platform specific elements in EFI Spec.
-
---*/
-
-//
-// Includes
-//
-
-#include "SctLib.h"
-#include "EfiCompliantBbTestMain_efi.h"
-#include EFI_PROTOCOL_DEFINITION (SimpleTextIn)
-#include <UEFI/Protocol/SimpleTextOut.h>
-#include <UEFI/Protocol/UgaDraw.h>
-#include EFI_PROTOCOL_DEFINITION (UgaIo)
-#include EFI_PROTOCOL_DEFINITION (SimplePointer)
-#include EFI_PROTOCOL_DEFINITION (BlockIo)
-#include EFI_PROTOCOL_DEFINITION (DiskIo)
-#include EFI_PROTOCOL_DEFINITION (SimpleFileSystem)
-#include EFI_PROTOCOL_DEFINITION (UnicodeCollation)
-#include EFI_PROTOCOL_DEFINITION (SimpleNetwork)
-#include EFI_PROTOCOL_DEFINITION (PxeBaseCode)
-#include EFI_PROTOCOL_DEFINITION (Bis)
-#include EFI_PROTOCOL_DEFINITION (SerialIo)
-#include EFI_PROTOCOL_DEFINITION (PciRootBridgeIo)
-#include EFI_PROTOCOL_DEFINITION (PciIo)
-#include EFI_PROTOCOL_DEFINITION (DeviceIo)
-#include EFI_PROTOCOL_DEFINITION (UsbHostController)
-#include EFI_PROTOCOL_DEFINITION (UsbIo)
-#include EFI_PROTOCOL_DEFINITION (ScsiPassThru)
-#include EFI_PROTOCOL_DEFINITION (DebugSupport)
-#include EFI_PROTOCOL_DEFINITION (DebugPort)
-#include EFI_PROTOCOL_DEFINITION (PlatformDriverOverride)
-
-//
-// Module definitions
-//
-
-#define SECTION_NAME_PLATFORM_SPECIFIC      L"Platform Specific"
-
-//
-// Internal functions declarations
-//
-
-EFI_TEST_ASSERTION
-NeedOneOrWarning (
-  IN BOOLEAN                      ValueA
-  );
-
-EFI_TEST_ASSERTION
-NeedTwoOrWarning (
-  IN BOOLEAN                      ValueA,
-  IN BOOLEAN                      ValueB
-  );
-
-EFI_TEST_ASSERTION
-NeedThreeOrWarning (
-  IN BOOLEAN                      ValueA,
-  IN BOOLEAN                      ValueB,
-  IN BOOLEAN                      ValueC
-  );
-
-EFI_TEST_ASSERTION
-NeedFourOrWarning (
-  IN BOOLEAN                      ValueA,
-  IN BOOLEAN                      ValueB,
-  IN BOOLEAN                      ValueC,
-  IN BOOLEAN                      valueD
-  );
-
-EFI_STATUS
-CheckConsoleProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  );
-
-EFI_STATUS
-CheckGraphicalConsoleProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  );
-
-EFI_STATUS
-CheckPointerProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  );
-
-EFI_STATUS
-CheckBootFromDiskProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  );
-
-EFI_STATUS
-CheckBootFromNetworkProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  );
-
-EFI_STATUS
-CheckUartProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  );
-
-EFI_STATUS
-CheckPciProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  );
-
-EFI_STATUS
-CheckUsbProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  );
-
-EFI_STATUS
-CheckScsiProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  );
-
-EFI_STATUS
-CheckDebugProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  );
-
-EFI_STATUS
-CheckDriverOverrideProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  );
-
-//
-// External functions implementation
-//
-
-EFI_STATUS
-PlatformSpecificElementsBbTest (
-  IN EFI_BB_TEST_PROTOCOL         *This,
-  IN VOID                         *ClientInterface,
-  IN EFI_TEST_LEVEL               TestLevel,
-  IN EFI_HANDLE                   SupportHandle
-  )
-/*++
-
-Routine Description:
-
-  Check the platform specific elements, which defined in the EFI spec 1.10,
-  section 2.6.2.
-
---*/
-{
-  EFI_STATUS                          Status;
-  EFI_STANDARD_TEST_LIBRARY_PROTOCOL  *StandardLib;
-  EFI_TEST_PROFILE_LIBRARY_PROTOCOL   *ProfileLib;
-  EFI_INI_FILE_HANDLE                 IniFile;
-
-  //
-  // Locate the standard test library protocol
-  //
-  Status = gtBS->HandleProtocol (
-                   SupportHandle,
-                   &gEfiStandardTestLibraryGuid,
-                   (VOID **) &StandardLib
-                   );
-  if (EFI_ERROR (Status)) {
-    return Status;
-  }
-
-  //
-  // Locate the test profile library protocol
-  //
-  Status = gtBS->HandleProtocol (
-                   SupportHandle,
-                   &gEfiTestProfileLibraryGuid,
-                   (VOID **) &ProfileLib
-                   );
-  if (EFI_ERROR (Status)) {
-    return Status;
-  }
-
-  //
-  // Open the INI file
-  //
-  Status = OpenIniFile (
-             ProfileLib,
-             EFI_COMPLIANT_BB_TEST_INI_PATH,
-             EFI_COMPLIANT_BB_TEST_INI_FILE,
-             &IniFile
-             );
-  if (EFI_ERROR (Status)) {
-    StandardLib->RecordAssertion (
-                   StandardLib,
-                   EFI_TEST_ASSERTION_WARNING,
-                   gTestGenericFailureGuid,
-                   L"EFI Compliant - Cannot open INI file",
-                   L"%a:%d",
-                   __FILE__,
-                   (UINTN)__LINE__
-                   );
-
-    return Status;
-  }
-
-  //
-  // Check the console protocols
-  //
-  CheckConsoleProtocols (StandardLib, IniFile);
-
-  //
-  // Check the graphical console protocols
-  //
-  CheckGraphicalConsoleProtocols (StandardLib, IniFile);
-
-  //
-  // Check the pointer protocols
-  //
-  CheckPointerProtocols (StandardLib, IniFile);
-
-  //
-  // Check the boot from disk protocols
-  //
-  CheckBootFromDiskProtocols (StandardLib, IniFile);
-
-  //
-  // Check the boot from network protocols
-  //
-  CheckBootFromNetworkProtocols (StandardLib, IniFile);
-
-  //
-  // Check the UART support protocols
-  //
-  CheckUartProtocols (StandardLib, IniFile);
-
-  //
-  // Check the PCI support protocols
-  //
-  CheckPciProtocols (StandardLib, IniFile);
-
-  //
-  // Check the USB support protocols
-  //
-  CheckUsbProtocols (StandardLib, IniFile);
-
-  //
-  // Check the SCSI support protocols
-  //
-  CheckScsiProtocols (StandardLib, IniFile);
-
-  //
-  // Check the Debug support protocols
-  //
-  CheckDebugProtocols (StandardLib, IniFile);
-
-  //
-  // Check the driver override protocols
-  //
-  CheckDriverOverrideProtocols (StandardLib, IniFile);
-
-  //
-  // Close the INI file
-  //
-  CloseIniFile (ProfileLib, IniFile);
-
-  //
-  // Done
-  //
-  return EFI_SUCCESS;
-}
-
-//
-// Internal functions implementation
-//
-
-EFI_TEST_ASSERTION
-NeedOneOrWarning (
-  IN BOOLEAN                      ValueA
-  )
-{
-  if (ValueA) {
-    return EFI_TEST_ASSERTION_PASSED;
-  } else {
-    return EFI_TEST_ASSERTION_WARNING;
-  }
-}
-
-EFI_TEST_ASSERTION
-NeedTwoOrWarning (
-  IN BOOLEAN                      ValueA,
-  IN BOOLEAN                      ValueB
-  )
-{
-  if (ValueA && ValueB) {
-    //
-    // Both are true
-    //
-    return EFI_TEST_ASSERTION_PASSED;
-  }
-
-  if (!ValueA && !ValueB) {
-    //
-    // Both are false
-    //
-    return EFI_TEST_ASSERTION_WARNING;
-  }
-
-  //
-  // In different states
-  //
-  return EFI_TEST_ASSERTION_FAILED;
-}
-
-EFI_TEST_ASSERTION
-NeedThreeOrWarning (
-  IN BOOLEAN                      ValueA,
-  IN BOOLEAN                      ValueB,
-  IN BOOLEAN                      ValueC
-  )
-{
-  if (ValueA && ValueB && ValueC) {
-    //
-    // All are true
-    //
-    return EFI_TEST_ASSERTION_PASSED;
-  }
-
-  if (!ValueA && !ValueB && !ValueC) {
-    //
-    // All are false
-    //
-    return EFI_TEST_ASSERTION_WARNING;
-  }
-
-  //
-  // In different states
-  //
-  return EFI_TEST_ASSERTION_FAILED;
-}
-
-EFI_TEST_ASSERTION
-NeedFourOrWarning (
-  IN BOOLEAN                      ValueA,
-  IN BOOLEAN                      ValueB,
-  IN BOOLEAN                      ValueC,
-  IN BOOLEAN                      ValueD
-  )
-{
-  if (ValueA && ValueB && ValueC && ValueD) {
-    //
-    // All are true
-    //
-    return EFI_TEST_ASSERTION_PASSED;
-  }
-
-  if (!ValueA && !ValueB && !ValueC && !ValueD) {
-    //
-    // All are false
-    //
-    return EFI_TEST_ASSERTION_WARNING;
-  }
-
-  //
-  // In different states
-  //
-  return EFI_TEST_ASSERTION_FAILED;
-}
-
-EFI_STATUS
-CheckConsoleProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  )
-{
-  EFI_STATUS          Status;
-  UINT32              MaxLength;
-  CHAR16              String[10];
-  BOOLEAN             ValueA;
-  BOOLEAN             ValueB;
-  VOID                *Interface;
-  EFI_TEST_ASSERTION  AssertionType;
-
-  //
-  // Check the SIMPLE_INPUT protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiSimpleTextInProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueA = TRUE;
-  } else {
-    ValueA = FALSE;
-  }
-
-  //
-  // Check the SIMPLE_TEXT_OUTPUT protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiSimpleTextOutProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueB = TRUE;
-  } else {
-    ValueB = FALSE;
-  }
-
-  //
-  // Need two or warning
-  //
-  AssertionType = NeedTwoOrWarning (ValueA, ValueB);
-
-  //
-  // For platform-specific elements, throw out a warning in default
-  //
-  if (AssertionType == EFI_TEST_ASSERTION_FAILED) {
-    AssertionType = EFI_TEST_ASSERTION_WARNING;
-  }
-
-  //
-  // If warning, check with INI file to decide they must exist or not
-  //
-  if ((AssertionType == EFI_TEST_ASSERTION_WARNING) &&
-      (IniFile       != NULL               )) {
-    MaxLength = 10;
-
-    Status = IniFile->GetString (
-                        IniFile,
-                        SECTION_NAME_PLATFORM_SPECIFIC,
-                        L"ConsoleDevices",
-                        String,
-                        &MaxLength
-                        );
-    if (!EFI_ERROR (Status) && (SctStriCmp (String, L"yes") == 0)) {
-      AssertionType = EFI_TEST_ASSERTION_FAILED;
-    }
-  }
-
-  //
-  // Record test result
-  //
-  StandardLib->RecordAssertion (
-                 StandardLib,
-                 AssertionType,
-                 gEfiCompliantBbTestPlatformAssertionGuid001,
-                 L"EFI Compliant - Console protocols must be implemented",
-                 L"%a:%d:Text Input - %s, Text Output - %s",
-                 __FILE__,
-                 (UINTN)__LINE__,
-                 ValueA ? L"Yes" : L"No",
-                 ValueB ? L"Yes" : L"No"
-                 );
-
-  //
-  // Done
-  //
-  return EFI_SUCCESS;
-}
-
-EFI_STATUS
-CheckGraphicalConsoleProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  )
-{
-  EFI_STATUS          Status;
-  UINT32              MaxLength;
-  CHAR16              String[10];
-  BOOLEAN             ValueA;
-  BOOLEAN             ValueB;
-  VOID                *Interface;
-  EFI_TEST_ASSERTION  AssertionType;
-
-  //
-  // Check the UGA_DRAW protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiUgaDrawProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueA = TRUE;
-  } else {
-    ValueA = FALSE;
-  }
-
-  //
-  // Check the UGA_IO protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiUgaIoProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueB = TRUE;
-  } else {
-    ValueB = FALSE;
-  }
-
-  //
-  // UEFI forum may want to drop UGA I/O protocol as a required implementation.
-  // So here we skip the check to this protocol.
-  //
-
-  //
-  // Need *one* or warning
-  //
-  AssertionType = NeedOneOrWarning (ValueA);
-
-  //
-  // For platform-specific elements, throw out a warning in default
-  //
-  if (AssertionType == EFI_TEST_ASSERTION_FAILED) {
-    AssertionType = EFI_TEST_ASSERTION_WARNING;
-  }
-
-  //
-  // If warning, check with INI file to decide they must exist or not
-  //
-  if ((AssertionType == EFI_TEST_ASSERTION_WARNING) &&
-      (IniFile       != NULL               )) {
-    MaxLength = 10;
-
-    Status = IniFile->GetString (
-                        IniFile,
-                        SECTION_NAME_PLATFORM_SPECIFIC,
-                        L"GraphicalConsoleDevices",
-                        String,
-                        &MaxLength
-                        );
-    if (!EFI_ERROR (Status) && (SctStriCmp (String, L"yes") == 0)) {
-      AssertionType = EFI_TEST_ASSERTION_FAILED;
-    }
-  }
-
-  //
-  // Record test result
-  //
-  StandardLib->RecordAssertion (
-                 StandardLib,
-                 AssertionType,
-                 gEfiCompliantBbTestPlatformAssertionGuid002,
-                 L"EFI Compliant - Graphical console protocols must be implemented",
-                 L"%a:%d:UGA Draw - %s, UGA IO (not required) - %s",
-                 __FILE__,
-                 (UINTN)__LINE__,
-                 ValueA ? L"Yes" : L"No",
-                 ValueB ? L"Yes" : L"No"
-                 );
-
-  //
-  // Done
-  //
-  return EFI_SUCCESS;
-}
-
-EFI_STATUS
-CheckPointerProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  )
-{
-  EFI_STATUS          Status;
-  UINT32              MaxLength;
-  CHAR16              String[10];
-  BOOLEAN             ValueA;
-  VOID                *Interface;
-  EFI_TEST_ASSERTION  AssertionType;
-
-  //
-  // Check the SIMPLE_POINTER protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiSimplePointerProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueA = TRUE;
-  } else {
-    ValueA = FALSE;
-  }
-
-  //
-  // Need one or warning
-  //
-  AssertionType = NeedOneOrWarning (ValueA);
-
-  //
-  // For platform-specific elements, throw out a warning in default
-  //
-  if (AssertionType == EFI_TEST_ASSERTION_FAILED) {
-    AssertionType = EFI_TEST_ASSERTION_WARNING;
-  }
-
-  //
-  // If warning, check with INI file to decide they must exist or not
-  //
-  if ((AssertionType == EFI_TEST_ASSERTION_WARNING) &&
-      (IniFile       != NULL               )) {
-    MaxLength = 10;
-
-    Status = IniFile->GetString (
-                        IniFile,
-                        SECTION_NAME_PLATFORM_SPECIFIC,
-                        L"PointerDevices",
-                        String,
-                        &MaxLength
-                        );
-    if (!EFI_ERROR (Status) && (SctStriCmp (String, L"yes") == 0)) {
-      AssertionType = EFI_TEST_ASSERTION_FAILED;
-    }
-  }
-
-  //
-  // Record test result
-  //
-  StandardLib->RecordAssertion (
-                 StandardLib,
-                 AssertionType,
-                 gEfiCompliantBbTestPlatformAssertionGuid003,
-                 L"EFI Compliant - Pointer protocols must be implemented",
-                 L"%a:%d:Pointer - %s",
-                 __FILE__,
-                 (UINTN)__LINE__,
-                 ValueA ? L"Yes" : L"No"
-                 );
-
-  //
-  // Done
-  //
-  return EFI_SUCCESS;
-}
-
-EFI_STATUS
-CheckBootFromDiskProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  )
-{
-  EFI_STATUS          Status;
-  UINT32              MaxLength;
-  CHAR16              String[10];
-  BOOLEAN             ValueA;
-  BOOLEAN             ValueB;
-  BOOLEAN             ValueC;
-  BOOLEAN             ValueD;
-  VOID                *Interface;
-  EFI_TEST_ASSERTION  AssertionType;
-
-  //
-  // Check the BLOCK_IO protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiBlockIoProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueA = TRUE;
-  } else {
-    ValueA = FALSE;
-  }
-
-  //
-  // Check the DISK_IO protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiDiskIoProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueB = TRUE;
-  } else {
-    ValueB = FALSE;
-  }
-
-  //
-  // Check the SIMPLE_FILE_SYSTEM protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiSimpleFileSystemProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueC = TRUE;
-  } else {
-    ValueC = FALSE;
-  }
-
-  //
-  // Check the UNICODE_COLLATION protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiUnicodeCollationProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueD = TRUE;
-  } else {
-    ValueD = FALSE;
-  }
-
-  //
-  // Need four or warning
-  //
-  AssertionType = NeedFourOrWarning (ValueA, ValueB, ValueC, ValueD);
-
-  //
-  // For platform-specific elements, throw out a warning in default
-  //
-  if (AssertionType == EFI_TEST_ASSERTION_FAILED) {
-    AssertionType = EFI_TEST_ASSERTION_WARNING;
-  }
-
-  //
-  // If warning, check with INI file to decide they must exist or not
-  //
-  if ((AssertionType == EFI_TEST_ASSERTION_WARNING) &&
-      (IniFile       != NULL               )) {
-    MaxLength = 10;
-
-    Status = IniFile->GetString (
-                        IniFile,
-                        SECTION_NAME_PLATFORM_SPECIFIC,
-                        L"BootFromDiskDevices",
-                        String,
-                        &MaxLength
-                        );
-    if (!EFI_ERROR (Status) && (SctStriCmp (String, L"yes") == 0)) {
-      AssertionType = EFI_TEST_ASSERTION_FAILED;
-    }
-  }
-
-  //
-  // Record test result
-  //
-  StandardLib->RecordAssertion (
-                 StandardLib,
-                 AssertionType,
-                 gEfiCompliantBbTestPlatformAssertionGuid004,
-                 L"EFI Compliant - Boot from disk protocols must be implemented",
-                 L"%a:%d:Block IO - %s, Disk IO - %s, Simple FS - %s, Unicode Collation - %s",
-                 __FILE__,
-                 (UINTN)__LINE__,
-                 ValueA ? L"Yes" : L"No",
-                 ValueB ? L"Yes" : L"No",
-                 ValueC ? L"Yes" : L"No",
-                 ValueD ? L"Yes" : L"No"
-                 );
-
-  //
-  // Done
-  //
-  return EFI_SUCCESS;
-}
-
-EFI_STATUS
-CheckBootFromNetworkProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  )
-{
-  EFI_STATUS          Status;
-  UINT32              MaxLength;
-  CHAR16              String[10];
-  BOOLEAN             ValueA;
-  BOOLEAN             ValueB;
-  BOOLEAN             ValueC;
-  VOID                *Interface;
-  EFI_TEST_ASSERTION  AssertionType;
-
-  //
-  // Check the SIMPLE_NETWORK protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiSimpleNetworkProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueA = TRUE;
-  } else {
-    ValueA = FALSE;
-  }
-
-  //
-  // Check the PXE_BASE_CODE protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiPxeBaseCodeProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueB = TRUE;
-  } else {
-    ValueB = FALSE;
-  }
-
-  //
-  // Check the BIS protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiBisProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueC = TRUE;
-  } else {
-    ValueC = FALSE;
-  }
-
-  //
-  // BIS protocol indicates the ability to validate a boot image received
-  // through a network device. UEFI forum may think it is not one of platform
-  // specific elements. So here we skip the check to this protocol.
-  //
-
-  //
-  // Need *two* or warning
-  //
-  AssertionType = NeedTwoOrWarning (ValueA, ValueB);
-
-  //
-  // For platform-specific elements, throw out a warning in default
-  //
-  if (AssertionType == EFI_TEST_ASSERTION_FAILED) {
-    AssertionType = EFI_TEST_ASSERTION_WARNING;
-  }
-
-  //
-  // If warning, check with INI file to decide they must exist or not
-  //
-  if ((AssertionType == EFI_TEST_ASSERTION_WARNING) &&
-      (IniFile       != NULL               )) {
-    MaxLength = 10;
-
-    Status = IniFile->GetString (
-                        IniFile,
-                        SECTION_NAME_PLATFORM_SPECIFIC,
-                        L"BootFromNetworkDevices",
-                        String,
-                        &MaxLength
-                        );
-    if (!EFI_ERROR (Status) && (SctStriCmp (String, L"yes") == 0)) {
-      AssertionType = EFI_TEST_ASSERTION_FAILED;
-    }
-  }
-
-  //
-  // Record test result
-  //
-  StandardLib->RecordAssertion (
-                 StandardLib,
-                 AssertionType,
-                 gEfiCompliantBbTestPlatformAssertionGuid005,
-                 L"EFI Compliant - Boot from network protocols must be implemented",
-                 L"%a:%d:SNP - %s, PXE BC - %s, BIS (not required) - %s",
-                 __FILE__,
-                 (UINTN)__LINE__,
-                 ValueA ? L"Yes" : L"No",
-                 ValueB ? L"Yes" : L"No",
-                 ValueC ? L"Yes" : L"No"
-                 );
-
-  //
-  // Done
-  //
-  return EFI_SUCCESS;
-}
-
-EFI_STATUS
-CheckUartProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  )
-{
-  EFI_STATUS          Status;
-  UINT32              MaxLength;
-  CHAR16              String[10];
-  BOOLEAN             ValueA;
-  VOID                *Interface;
-  EFI_TEST_ASSERTION  AssertionType;
-
-  //
-  // Check the SERIAL_IO protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiSerialIoProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueA = TRUE;
-  } else {
-    ValueA = FALSE;
-  }
-
-  //
-  // Need one or warning
-  //
-  AssertionType = NeedOneOrWarning (ValueA);
-
-  //
-  // For platform-specific elements, throw out a warning in default
-  //
-  if (AssertionType == EFI_TEST_ASSERTION_FAILED) {
-    AssertionType = EFI_TEST_ASSERTION_WARNING;
-  }
-
-  //
-  // If warning, check with INI file to decide they must exist or not
-  //
-  if ((AssertionType == EFI_TEST_ASSERTION_WARNING) &&
-      (IniFile       != NULL               )) {
-    MaxLength = 10;
-
-    Status = IniFile->GetString (
-                        IniFile,
-                        SECTION_NAME_PLATFORM_SPECIFIC,
-                        L"UartDevices",
-                        String,
-                        &MaxLength
-                        );
-    if (!EFI_ERROR (Status) && (SctStriCmp (String, L"yes") == 0)) {
-      AssertionType = EFI_TEST_ASSERTION_FAILED;
-    }
-  }
-
-  //
-  // Record test result
-  //
-  StandardLib->RecordAssertion (
-                 StandardLib,
-                 AssertionType,
-                 gEfiCompliantBbTestPlatformAssertionGuid006,
-                 L"EFI Compliant - UART protocols must be implemented",
-                 L"%a:%d:Serial IO - %s",
-                 __FILE__,
-                 (UINTN)__LINE__,
-                 ValueA ? L"Yes" : L"No"
-                 );
-
-  //
-  // Done
-  //
-  return EFI_SUCCESS;
-}
-
-EFI_STATUS
-CheckPciProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  )
-{
-  EFI_STATUS          Status;
-  UINT32              MaxLength;
-  CHAR16              String[10];
-  BOOLEAN             ValueA;
-  BOOLEAN             ValueB;
-  BOOLEAN             ValueC;
-  VOID                *Interface;
-  EFI_TEST_ASSERTION  AssertionType;
-
-  //
-  // Check the PCI_ROOT_BRIDGE_IO protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiPciRootBridgeIoProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueA = TRUE;
-  } else {
-    ValueA = FALSE;
-  }
-
-  //
-  // Check the PCI_IO protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiPciIoProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueB = TRUE;
-  } else {
-    ValueB = FALSE;
-  }
-
-  //
-  // Check the DEVICE_IO protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiDeviceIoProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueC = TRUE;
-  } else {
-    ValueC = FALSE;
-  }
-
-  //
-  // UEFI forum may want to eliminate Device IO protocol and require all drivers
-  // today to use PCI I/O protocols. So here we skip the check to this protocol.
-  //
-
-  //
-  // Need *two* or warning
-  //
-  AssertionType = NeedTwoOrWarning (ValueA, ValueB);
-
-  //
-  // For platform-specific elements, throw out a warning in default
-  //
-  if (AssertionType == EFI_TEST_ASSERTION_FAILED) {
-    AssertionType = EFI_TEST_ASSERTION_WARNING;
-  }
-
-  //
-  // If warning, check with INI file to decide they must exist or not
-  //
-  if ((AssertionType == EFI_TEST_ASSERTION_WARNING) &&
-      (IniFile       != NULL               )) {
-    MaxLength = 10;
-
-    Status = IniFile->GetString (
-                        IniFile,
-                        SECTION_NAME_PLATFORM_SPECIFIC,
-                        L"PciBusSupport",
-                        String,
-                        &MaxLength
-                        );
-    if (!EFI_ERROR (Status) && (SctStriCmp (String, L"yes") == 0)) {
-      AssertionType = EFI_TEST_ASSERTION_FAILED;
-    }
-  }
-
-  //
-  // Record test result
-  //
-  StandardLib->RecordAssertion (
-                 StandardLib,
-                 AssertionType,
-                 gEfiCompliantBbTestPlatformAssertionGuid007,
-                 L"EFI Compliant - PCI Bus support protocols must be implemented",
-                 L"%a:%d:PCI Root Bridge - %s, PCI IO - %s, Device IO (not required) - %s",
-                 __FILE__,
-                 (UINTN)__LINE__,
-                 ValueA ? L"Yes" : L"No",
-                 ValueB ? L"Yes" : L"No",
-                 ValueC ? L"Yes" : L"No"
-                 );
-
-  //
-  // Done
-  //
-  return EFI_SUCCESS;
-}
-
-EFI_STATUS
-CheckUsbProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  )
-{
-  EFI_STATUS          Status;
-  UINT32              MaxLength;
-  CHAR16              String[10];
-  BOOLEAN             ValueA;
-  BOOLEAN             ValueB;
-  VOID                *Interface;
-  EFI_TEST_ASSERTION  AssertionType;
-
-  //
-  // Check the USB_HC protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiUsbHcProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueA = TRUE;
-  } else {
-    ValueA = FALSE;
-  }
-
-  //
-  // Check the USB_IO protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiUsbIoProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueB = TRUE;
-  } else {
-    ValueB = FALSE;
-  }
-
-  //
-  // Need two or warning
-  //
-  AssertionType = NeedTwoOrWarning (ValueA, ValueB);
-
-  //
-  // For platform-specific elements, throw out a warning in default
-  //
-  if (AssertionType == EFI_TEST_ASSERTION_FAILED) {
-    AssertionType = EFI_TEST_ASSERTION_WARNING;
-  }
-
-  //
-  // If warning, check with INI file to decide they must exist or not
-  //
-  if ((AssertionType == EFI_TEST_ASSERTION_WARNING) &&
-      (IniFile       != NULL               )) {
-    MaxLength = 10;
-
-    Status = IniFile->GetString (
-                        IniFile,
-                        SECTION_NAME_PLATFORM_SPECIFIC,
-                        L"UsbBusSupport",
-                        String,
-                        &MaxLength
-                        );
-    if (!EFI_ERROR (Status) && (SctStriCmp (String, L"yes") == 0)) {
-      AssertionType = EFI_TEST_ASSERTION_FAILED;
-    }
-  }
-
-  //
-  // Record test result
-  //
-  StandardLib->RecordAssertion (
-                 StandardLib,
-                 AssertionType,
-                 gEfiCompliantBbTestPlatformAssertionGuid008,
-                 L"EFI Compliant - USB Bus support protocols must be implemented",
-                 L"%a:%d:USB HC - %s, USB IO - %s",
-                 __FILE__,
-                 (UINTN)__LINE__,
-                 ValueA ? L"Yes" : L"No",
-                 ValueB ? L"Yes" : L"No"
-                 );
-
-  //
-  // Done
-  //
-  return EFI_SUCCESS;
-}
-
-EFI_STATUS
-CheckScsiProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  )
-{
-  EFI_STATUS          Status;
-  UINT32              MaxLength;
-  CHAR16              String[10];
-  BOOLEAN             ValueA;
-  VOID                *Interface;
-  EFI_TEST_ASSERTION  AssertionType;
-
-  //
-  // Check the SCSI_PASS_THRU protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiScsiPassThruProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueA = TRUE;
-  } else {
-    ValueA = FALSE;
-  }
-
-  //
-  // Need one or warning
-  //
-  AssertionType = NeedOneOrWarning (ValueA);
-
-  //
-  // For platform-specific elements, throw out a warning in default
-  //
-  if (AssertionType == EFI_TEST_ASSERTION_FAILED) {
-    AssertionType = EFI_TEST_ASSERTION_WARNING;
-  }
-
-  //
-  // If warning, check with INI file to decide they must exist or not
-  //
-  if ((AssertionType == EFI_TEST_ASSERTION_WARNING) &&
-      (IniFile       != NULL               )) {
-    MaxLength = 10;
-
-    Status = IniFile->GetString (
-                        IniFile,
-                        SECTION_NAME_PLATFORM_SPECIFIC,
-                        L"ScsiPassThru",
-                        String,
-                        &MaxLength
-                        );
-    if (!EFI_ERROR (Status) && (SctStriCmp (String, L"yes") == 0)) {
-      AssertionType = EFI_TEST_ASSERTION_FAILED;
-    }
-  }
-
-  //
-  // Record test result
-  //
-  StandardLib->RecordAssertion (
-                 StandardLib,
-                 AssertionType,
-                 gEfiCompliantBbTestPlatformAssertionGuid009,
-                 L"EFI Compliant - SCSI Pass Thru protocol must be implemented",
-                 L"%a:%d:SCSI Pass Thru - %s",
-                 __FILE__,
-                 (UINTN)__LINE__,
-                 ValueA ? L"Yes" : L"No"
-                 );
-
-  //
-  // Done
-  //
-  return EFI_SUCCESS;
-}
-
-EFI_STATUS
-CheckDebugProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  )
-{
-  EFI_STATUS          Status;
-  UINT32              MaxLength;
-  CHAR16              String[10];
-  BOOLEAN             ValueA;
-  BOOLEAN             ValueB;
-  VOID                *Interface;
-  EFI_TEST_ASSERTION  AssertionType;
-
-  //
-  // Check the DEBUG_SUPPORT protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiDebugSupportProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueA = TRUE;
-  } else {
-    ValueA = FALSE;
-  }
-
-  //
-  // Check the DEBUG_PORT protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiDebugPortProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueB = TRUE;
-  } else {
-    ValueB = FALSE;
-  }
-
-  //
-  // Need two or warning
-  //
-  AssertionType = NeedTwoOrWarning (ValueA, ValueB);
-
-  //
-  // For platform-specific elements, throw out a warning in default
-  //
-  if (AssertionType == EFI_TEST_ASSERTION_FAILED) {
-    AssertionType = EFI_TEST_ASSERTION_WARNING;
-  }
-
-  //
-  // If warning, check with INI file to decide they must exist or not
-  //
-  if ((AssertionType == EFI_TEST_ASSERTION_WARNING) &&
-      (IniFile       != NULL               )) {
-    MaxLength = 10;
-
-    Status = IniFile->GetString (
-                        IniFile,
-                        SECTION_NAME_PLATFORM_SPECIFIC,
-                        L"DebugSupport",
-                        String,
-                        &MaxLength
-                        );
-    if (!EFI_ERROR (Status) && (SctStriCmp (String, L"yes") == 0)) {
-      AssertionType = EFI_TEST_ASSERTION_FAILED;
-    }
-  }
-
-  //
-  // Record test result
-  //
-  StandardLib->RecordAssertion (
-                 StandardLib,
-                 AssertionType,
-                 gEfiCompliantBbTestPlatformAssertionGuid010,
-                 L"EFI Compliant - Debug support protocols must be implemented",
-                 L"%a:%d:Debug Support - %s, Debug Port - %s",
-                 __FILE__,
-                 (UINTN)__LINE__,
-                 ValueA ? L"Yes" : L"No",
-                 ValueB ? L"Yes" : L"No"
-                 );
-
-  //
-  // Done
-  //
-  return EFI_SUCCESS;
-}
-
-EFI_STATUS
-CheckDriverOverrideProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  )
-{
-  EFI_STATUS          Status;
-  UINT32              MaxLength;
-  CHAR16              String[10];
-  BOOLEAN             ValueA;
-  VOID                *Interface;
-  EFI_TEST_ASSERTION  AssertionType;
-
-  //
-  // Check the DRIVER_OVERRIDE protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiPlatformDriverOverrideProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueA = TRUE;
-  } else {
-    ValueA = FALSE;
-  }
-
-  //
-  // Need one or warning
-  //
-  AssertionType = NeedOneOrWarning (ValueA);
-
-  //
-  // For platform-specific elements, throw out a warning in default
-  //
-  if (AssertionType == EFI_TEST_ASSERTION_FAILED) {
-    AssertionType = EFI_TEST_ASSERTION_WARNING;
-  }
-
-  //
-  // If warning, check with INI file to decide they must exist or not
-  //
-  if ((AssertionType == EFI_TEST_ASSERTION_WARNING) &&
-      (IniFile       != NULL               )) {
-    MaxLength = 10;
-
-    Status = IniFile->GetString (
-                        IniFile,
-                        SECTION_NAME_PLATFORM_SPECIFIC,
-                        L"PlatformDriverOverride",
-                        String,
-                        &MaxLength
-                        );
-    if (!EFI_ERROR (Status) && (SctStriCmp (String, L"yes") == 0)) {
-      AssertionType = EFI_TEST_ASSERTION_FAILED;
-    }
-  }
-
-  //
-  // Record test result
-  //
-  StandardLib->RecordAssertion (
-                 StandardLib,
-                 AssertionType,
-                 gEfiCompliantBbTestPlatformAssertionGuid011,
-                 L"EFI Compliant - Platform Driver Override protocols must be implemented",
-                 L"%a:%d:Platform Driver Override - %s",
-                 __FILE__,
-                 (UINTN)__LINE__,
-                 ValueA ? L"Yes" : L"No"
-                 );
-
-  //
-  // Done
-  //
-  return EFI_SUCCESS;
-}
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestRequired_efi.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestRequired_efi.c
deleted file mode 100644
index 55164c7..0000000
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestRequired_efi.c
+++ /dev/null
@@ -1,820 +0,0 @@
-/** @file
-
-  Copyright 2006 - 2016 Unified EFI, Inc.<BR>
-  Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>
-
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at 
-  http://opensource.org/licenses/bsd-license.php
- 
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
- 
-**/
-/*++
-
-Module Name:
-
-  EfiCompliantBbTestRequired.c
-
-Abstract:
-
-  Check the required elements in EFI Spec.
-
---*/
-
-//
-// Includes
-//
-
-#include "SctLib.h"
-#include "EfiCompliantBbTestMain_efi.h"
-#include EFI_PROTOCOL_DEFINITION (LoadedImage)
-#include EFI_PROTOCOL_DEFINITION (DevicePath)
-#include EFI_PROTOCOL_DEFINITION (Decompress)
-#include EFI_PROTOCOL_DEFINITION (Ebc)
-
-//
-// Internal functions declaration
-//
-
-EFI_STATUS
-CheckSystemTable (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib
-  );
-
-EFI_STATUS
-CheckBootServices (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib
-  );
-
-EFI_STATUS
-CheckRuntimeServices (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib
-  );
-
-EFI_STATUS
-CheckLoadedImageProtocol (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib
-  );
-
-EFI_STATUS
-CheckDevicePathProtocol (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib
-  );
-
-EFI_STATUS
-CheckDecompressProtocol (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib
-  );
-
-EFI_STATUS
-CheckEbcProtocol (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib
-  );
-
-//
-// External functions implementation
-//
-
-EFI_STATUS
-RequiredElementsBbTest (
-  IN EFI_BB_TEST_PROTOCOL         *This,
-  IN VOID                         *ClientInterface,
-  IN EFI_TEST_LEVEL               TestLevel,
-  IN EFI_HANDLE                   SupportHandle
-  )
-/*++
-
-Routine Description:
-
-  Check the required elements, which defined in the EFI spec 1.10, section
-  2.6.1.
-
---*/
-{
-  EFI_STATUS                          Status;
-  EFI_STANDARD_TEST_LIBRARY_PROTOCOL  *StandardLib;
-
-  //
-  // Locate the standard test library protocol
-  //
-  Status = gtBS->HandleProtocol (
-                   SupportHandle,
-                   &gEfiStandardTestLibraryGuid,
-                   (VOID **) &StandardLib
-                   );
-  if (EFI_ERROR (Status)) {
-    return Status;
-  }
-
-  //
-  // Check the EFI System Table
-  //
-  CheckSystemTable (StandardLib);
-
-  //
-  // Check the EFI Boot Services
-  //
-  CheckBootServices (StandardLib);
-
-  //
-  // Check the EFI Runtime Services
-  //
-  CheckRuntimeServices (StandardLib);
-
-  //
-  // Check the LOADED_IMAGE Protocol
-  //
-  CheckLoadedImageProtocol (StandardLib);
-
-  //
-  // Check the DEVICE_PATH Protocol
-  //
-  CheckDevicePathProtocol (StandardLib);
-
-  //
-  // Check the DECOMPRESS Protocol
-  //
-  CheckDecompressProtocol (StandardLib);
-
-  //
-  // Check the EBC Interpreter
-  //
-  CheckEbcProtocol (StandardLib);
-
-  //
-  // Done
-  //
-  return EFI_SUCCESS;
-}
-
-//
-// Internal functions implementation
-//
-
-EFI_STATUS
-CheckSystemTable (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib
-  )
-{
-  EFI_TEST_ASSERTION  AssertionType;
-  UINT32              CRC32;
-  UINT32              LocalCRC32;
-  EFI_STATUS          Status;
-
-  //
-  // Check the EFI System Table
-  //
-  CRC32 = gtST->Hdr.CRC32;
-  gtST->Hdr.CRC32 = 0;
-
-  LocalCRC32 = 0;
-  Status = SctCalculateCrc32 ((UINT8 *)gtST, gtST->Hdr.HeaderSize, &LocalCRC32);
-  if (EFI_ERROR (Status)) {
-    AssertionType = EFI_TEST_ASSERTION_FAILED;
-  } else {
-    if ((gtST->Hdr.Signature       == EFI_SYSTEM_TABLE_SIGNATURE      ) &&
-        (gtST->Hdr.Revision        >= 0x0001000A                      ) &&
-        (gtST->Hdr.Reserved        == 0x00000000                      ) &&
-        (gtST->RuntimeServices     != NULL                            ) &&
-        (gtST->BootServices        != NULL                            ) &&
-        (LocalCRC32                == CRC32)) {
-      AssertionType = EFI_TEST_ASSERTION_PASSED;
-    } else {
-      AssertionType = EFI_TEST_ASSERTION_FAILED;
-    }
-
-    gtST->Hdr.CRC32 = CRC32;
-  }
-
-  StandardLib->RecordAssertion (
-                 StandardLib,
-                 AssertionType,
-                 gEfiCompliantBbTestRequiredAssertionGuid001,
-                 L"EFI Compliant - EFI System Table must be implemented",
-                 L"%a:%d:Signature - %lX, Expected - %lX",
-                 __FILE__,
-                 (UINTN)__LINE__,
-                 gtST->Hdr.Signature,
-                 EFI_SYSTEM_TABLE_SIGNATURE
-                 );
-
-  //
-  // Record the entire EFI System Table
-  //
-  StandardLib->RecordMessage (
-                 StandardLib,
-                 EFI_VERBOSE_LEVEL_DEFAULT,
-                 L"  Hdr.Signature        : %lX\n"
-                 L"  Hdr.Revision         : %X\n"
-                 L"  Hdr.HeaderSize       : %X\n"
-                 L"  Hdr.CRC32            : %X\n"
-                 L"  Hdr.Reserved         : %X\n",
-                 gtST->Hdr.Signature,
-                 gtST->Hdr.Revision,
-                 gtST->Hdr.HeaderSize,
-                 gtST->Hdr.CRC32,
-                 gtST->Hdr.Reserved
-                 );
-
-  StandardLib->RecordMessage (
-                 StandardLib,
-                 EFI_VERBOSE_LEVEL_DEFAULT,
-                 L"  FirmwareVendor       : %s\n"
-                 L"  FirmwareRevision     : %X\n"
-                 L"  ConsoleInHandle      : %X\n"
-                 L"  ConIn                : %X\n"
-                 L"  ConsoleOutHandle     : %X\n"
-                 L"  ConOut               : %X\n"
-                 L"  StandardErrorHandle  : %X\n"
-                 L"  StdErr               : %X\n"
-                 L"  RuntimeServices      : %X\n"
-                 L"  BootServices         : %X\n"
-                 L"  NumberOfTableEntries : %X\n"
-                 L"  ConfigurationTable   : %X\n",
-                 gtST->FirmwareVendor,
-                 gtST->FirmwareRevision,
-                 gtST->ConsoleInHandle,
-                 gtST->ConIn,
-                 gtST->ConsoleOutHandle,
-                 gtST->ConOut,
-                 gtST->StandardErrorHandle,
-                 gtST->StdErr,
-                 gtST->RuntimeServices,
-                 gtST->BootServices,
-                 gtST->NumberOfTableEntries,
-                 gtST->ConfigurationTable
-                 );
-
-  //
-  // Done
-  //
-  return EFI_SUCCESS;
-}
-
-EFI_STATUS
-CheckBootServices (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib
-  )
-{
-  EFI_TEST_ASSERTION  AssertionType;
-  UINT32              CRC32;
-  UINT32              LocalCRC32;
-  EFI_STATUS          Status;
-
-  //
-  // Check the EFI Boot Services Table
-  //
-  CRC32 = gtBS->Hdr.CRC32;
-  gtBS->Hdr.CRC32 = 0;
-
-  LocalCRC32 = 0;
-  Status = SctCalculateCrc32 ((UINT8 *)gtBS, gtBS->Hdr.HeaderSize, &LocalCRC32);
-  if (EFI_ERROR (Status)) {
-    AssertionType = EFI_TEST_ASSERTION_FAILED;
-  } else {
-    if ((gtBS->Hdr.Signature                       == EFI_BOOT_SERVICES_SIGNATURE) &&
-        (gtBS->Hdr.Revision                        >= 0x0001000A                 ) &&
-        (gtBS->Hdr.Reserved                        == 0x00000000                 ) &&
-        (gtBS->RaiseTPL                            != NULL                       ) &&
-        (gtBS->RestoreTPL                          != NULL                       ) &&
-        (gtBS->AllocatePages                       != NULL                       ) &&
-        (gtBS->FreePages                           != NULL                       ) &&
-        (gtBS->GetMemoryMap                        != NULL                       ) &&
-        (gtBS->AllocatePool                        != NULL                       ) &&
-        (gtBS->FreePool                            != NULL                       ) &&
-        (gtBS->CreateEvent                         != NULL                       ) &&
-        (gtBS->SetTimer                            != NULL                       ) &&
-        (gtBS->WaitForEvent                        != NULL                       ) &&
-        (gtBS->SignalEvent                         != NULL                       ) &&
-        (gtBS->CloseEvent                          != NULL                       ) &&
-        (gtBS->CheckEvent                          != NULL                       ) &&
-        (gtBS->InstallProtocolInterface            != NULL                       ) &&
-        (gtBS->ReinstallProtocolInterface          != NULL                       ) &&
-        (gtBS->UninstallProtocolInterface          != NULL                       ) &&
-        (gtBS->HandleProtocol                      != NULL                       ) &&
-        (gtBS->RegisterProtocolNotify              != NULL                       ) &&
-        (gtBS->LocateHandle                        != NULL                       ) &&
-        (gtBS->LocateDevicePath                    != NULL                       ) &&
-        (gtBS->InstallConfigurationTable           != NULL                       ) &&
-        (gtBS->LoadImage                           != NULL                       ) &&
-        (gtBS->StartImage                          != NULL                       ) &&
-        (gtBS->Exit                                != NULL                       ) &&
-        (gtBS->UnloadImage                         != NULL                       ) &&
-        (gtBS->ExitBootServices                    != NULL                       ) &&
-        (gtBS->GetNextMonotonicCount               != NULL                       ) &&
-        (gtBS->Stall                               != NULL                       ) &&
-        (gtBS->SetWatchdogTimer                    != NULL                       ) &&
-        (gtBS->ConnectController                   != NULL                       ) &&
-        (gtBS->DisconnectController                != NULL                       ) &&
-        (gtBS->OpenProtocol                        != NULL                       ) &&
-        (gtBS->CloseProtocol                       != NULL                       ) &&
-        (gtBS->OpenProtocolInformation             != NULL                       ) &&
-        (gtBS->ProtocolsPerHandle                  != NULL                       ) &&
-        (gtBS->LocateHandleBuffer                  != NULL                       ) &&
-        (gtBS->LocateProtocol                      != NULL                       ) &&
-        (gtBS->InstallMultipleProtocolInterfaces   != NULL                       ) &&
-        (gtBS->UninstallMultipleProtocolInterfaces != NULL                       ) &&
-        (gtBS->CalculateCrc32                      != NULL                       ) &&
-        (gtBS->CopyMem                             != NULL                       ) &&
-        (gtBS->SetMem                              != NULL                       ) &&
-        (LocalCRC32                                == CRC32           )) {
-      AssertionType = EFI_TEST_ASSERTION_PASSED;
-    } else {
-      AssertionType = EFI_TEST_ASSERTION_FAILED;
-    }
-  }
-
-  gtBS->Hdr.CRC32 = CRC32;
-
-  StandardLib->RecordAssertion (
-                 StandardLib,
-                 AssertionType,
-                 gEfiCompliantBbTestRequiredAssertionGuid002,
-                 L"EFI Compliant - EFI Boot Services Table must be implemented",
-                 L"%a:%d:Signature - %lX, Expected - %lX",
-                 __FILE__,
-                 (UINTN)__LINE__,
-                 gtBS->Hdr.Signature,
-                 EFI_BOOT_SERVICES_SIGNATURE
-                 );
-
-  //
-  // Record the entire EFI Boot Services Table
-  //
-  StandardLib->RecordMessage (
-                 StandardLib,
-                 EFI_VERBOSE_LEVEL_DEFAULT,
-                 L"  Hdr.Signature                       : %lX\n"
-                 L"  Hdr.Revision                        : %X\n"
-                 L"  Hdr.HeaderSize                      : %X\n"
-                 L"  Hdr.CRC32                           : %X\n"
-                 L"  Hdr.Reserved                        : %X\n",
-                 gtBS->Hdr.Signature,
-                 gtBS->Hdr.Revision,
-                 gtBS->Hdr.HeaderSize,
-                 gtBS->Hdr.CRC32,
-                 gtBS->Hdr.Reserved
-                 );
-
-  StandardLib->RecordMessage (
-                 StandardLib,
-                 EFI_VERBOSE_LEVEL_DEFAULT,
-                 L"  RaiseTPL                            : %X\n"
-                 L"  RestoreTPL                          : %X\n"
-                 L"  AllocatePages                       : %X\n"
-                 L"  FreePages                           : %X\n"
-                 L"  GetMemoryMap                        : %X\n"
-                 L"  AllocatePool                        : %X\n"
-                 L"  FreePool                            : %X\n",
-                 gtBS->RaiseTPL,
-                 gtBS->RestoreTPL,
-                 gtBS->AllocatePages,
-                 gtBS->FreePages,
-                 gtBS->GetMemoryMap,
-                 gtBS->AllocatePool,
-                 gtBS->FreePool
-                 );
-
-  StandardLib->RecordMessage (
-                 StandardLib,
-                 EFI_VERBOSE_LEVEL_DEFAULT,
-                 L"  CreateEvent                         : %X\n"
-                 L"  SetTimer                            : %X\n"
-                 L"  WaitForEvent                        : %X\n"
-                 L"  SignalEvent                         : %X\n"
-                 L"  CloseEvent                          : %X\n"
-                 L"  CheckEvent                          : %X\n",
-                 gtBS->CreateEvent,
-                 gtBS->SetTimer,
-                 gtBS->WaitForEvent,
-                 gtBS->SignalEvent,
-                 gtBS->CloseEvent,
-                 gtBS->CheckEvent
-                 );
-
-  StandardLib->RecordMessage (
-                 StandardLib,
-                 EFI_VERBOSE_LEVEL_DEFAULT,
-                 L"  InstallProtocolInterface            : %X\n"
-                 L"  ReinstallProtocolInterface          : %X\n"
-                 L"  UninstallProtocolInterface          : %X\n"
-                 L"  HandleProtocol                      : %X\n"
-                 L"  Reserved                            : %X\n"
-                 L"  RegisterProtocolNotify              : %X\n"
-                 L"  LocateHandle                        : %X\n"
-                 L"  LocateDevicePath                    : %X\n",
-                 gtBS->InstallProtocolInterface,
-                 gtBS->ReinstallProtocolInterface,
-                 gtBS->UninstallProtocolInterface,
-                 gtBS->HandleProtocol,
-                 gtBS->Reserved,
-                 gtBS->RegisterProtocolNotify,
-                 gtBS->LocateHandle,
-                 gtBS->LocateDevicePath
-                 );
-
-  StandardLib->RecordMessage (
-                 StandardLib,
-                 EFI_VERBOSE_LEVEL_DEFAULT,
-                 L"  InstallConfigurationTable           : %X\n",
-                 gtBS->InstallConfigurationTable
-                 );
-
-  StandardLib->RecordMessage (
-                 StandardLib,
-                 EFI_VERBOSE_LEVEL_DEFAULT,
-                 L"  LoadImage                           : %X\n"
-                 L"  StartImage                          : %X\n"
-                 L"  Exit                                : %X\n"
-                 L"  UnloadImage                         : %X\n"
-                 L"  ExitBootServices                    : %X\n"
-                 L"  GetNextMonotonicCount               : %X\n"
-                 L"  Stall                               : %X\n"
-                 L"  SetWatchdogTimer                    : %X\n",
-                 gtBS->LoadImage,
-                 gtBS->StartImage,
-                 gtBS->Exit,
-                 gtBS->UnloadImage,
-                 gtBS->ExitBootServices,
-                 gtBS->GetNextMonotonicCount,
-                 gtBS->Stall,
-                 gtBS->SetWatchdogTimer
-                 );
-
-  StandardLib->RecordMessage (
-                 StandardLib,
-                 EFI_VERBOSE_LEVEL_DEFAULT,
-                 L"  ConnectController                   : %X\n"
-                 L"  DisconnectController                : %X\n"
-                 L"  OpenProtocol                        : %X\n"
-                 L"  CloseProtocol                       : %X\n"
-                 L"  OpenProtocolInformation             : %X\n"
-                 L"  ProtocolsPerHandle                  : %X\n"
-                 L"  LocateHandleBuffer                  : %X\n"
-                 L"  LocateProtocol                      : %X\n",
-                 gtBS->ConnectController,
-                 gtBS->DisconnectController,
-                 gtBS->OpenProtocol,
-                 gtBS->CloseProtocol,
-                 gtBS->OpenProtocolInformation,
-                 gtBS->ProtocolsPerHandle,
-                 gtBS->LocateHandleBuffer,
-                 gtBS->LocateProtocol
-                 );
-
-  StandardLib->RecordMessage (
-                 StandardLib,
-                 EFI_VERBOSE_LEVEL_DEFAULT,
-                 L"  InstallMultipleProtocolInterfaces   : %X\n"
-                 L"  UninstallMultipleProtocolInterfaces : %X\n",
-                 gtBS->InstallMultipleProtocolInterfaces,
-                 gtBS->UninstallMultipleProtocolInterfaces
-                 );
-
-  StandardLib->RecordMessage (
-                 StandardLib,
-                 EFI_VERBOSE_LEVEL_DEFAULT,
-                 L"  CalculateCrc32                      : %X\n"
-                 L"  CopyMem                             : %X\n"
-                 L"  SetMem                              : %X\n",
-                 gtBS->CalculateCrc32,
-                 gtBS->CopyMem,
-                 gtBS->SetMem
-                 );
-
-  //
-  // Done
-  //
-  return EFI_SUCCESS;
-}
-
-EFI_STATUS
-CheckRuntimeServices (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib
-  )
-{
-  EFI_TEST_ASSERTION  AssertionType;
-  UINT32              CRC32;
-  UINT32              LocalCRC32;
-  EFI_STATUS          Status;
-
-  //
-  // Check the EFI Runtime Services Table
-  //
-  CRC32 = gtRT->Hdr.CRC32;
-  gtRT->Hdr.CRC32 = 0;
-
-  LocalCRC32 = 0;
-  Status = SctCalculateCrc32 ((UINT8 *)gtRT, gtRT->Hdr.HeaderSize, &LocalCRC32);
-  if (EFI_ERROR (Status)) {
-    AssertionType = EFI_TEST_ASSERTION_FAILED;
-  } else {
-    if ((gtRT->Hdr.Signature             == EFI_RUNTIME_SERVICES_SIGNATURE) &&
-        (gtRT->Hdr.Revision              >= 0x0001000A                    ) &&
-        (gtRT->Hdr.Reserved              == 0x00000000                    ) &&
-        (gtRT->GetTime                   != NULL                          ) &&
-        (gtRT->SetTime                   != NULL                          ) &&
-        (gtRT->GetWakeupTime             != NULL                          ) &&
-        (gtRT->SetWakeupTime             != NULL                          ) &&
-        (gtRT->SetVirtualAddressMap      != NULL                          ) &&
-        (gtRT->ConvertPointer            != NULL                          ) &&
-        (gtRT->GetVariable               != NULL                          ) &&
-        (gtRT->GetNextVariableName       != NULL                          ) &&
-        (gtRT->SetVariable               != NULL                          ) &&
-        (gtRT->GetNextHighMonotonicCount != NULL                          ) &&
-        (gtRT->ResetSystem               != NULL                          ) &&
-        (LocalCRC32                      == CRC32                         )) {
-      AssertionType = EFI_TEST_ASSERTION_PASSED;
-    } else {
-      AssertionType = EFI_TEST_ASSERTION_FAILED;
-    }
-  }
-
-  gtRT->Hdr.CRC32 = CRC32;
-
-  StandardLib->RecordAssertion (
-                 StandardLib,
-                 AssertionType,
-                 gEfiCompliantBbTestRequiredAssertionGuid003,
-                 L"EFI Compliant - EFI Runtime Services Table must be implemented",
-                 L"%a:%d:Signature - %lX, Expected - %lX",
-                 __FILE__,
-                 (UINTN)__LINE__,
-                 gtRT->Hdr.Signature,
-                 EFI_RUNTIME_SERVICES_SIGNATURE
-                 );
-
-  //
-  // Record the entire EFI Runtime Services Table
-  //
-  StandardLib->RecordMessage (
-                 StandardLib,
-                 EFI_VERBOSE_LEVEL_DEFAULT,
-                 L"  Hdr.Signature             : %lX\n"
-                 L"  Hdr.Revision              : %X\n"
-                 L"  Hdr.HeaderSize            : %X\n"
-                 L"  Hdr.CRC32                 : %X\n"
-                 L"  Hdr.Reserved              : %X\n",
-                 gtRT->Hdr.Signature,
-                 gtRT->Hdr.Revision,
-                 gtRT->Hdr.HeaderSize,
-                 gtRT->Hdr.CRC32,
-                 gtRT->Hdr.Reserved
-                 );
-
-  StandardLib->RecordMessage (
-                 StandardLib,
-                 EFI_VERBOSE_LEVEL_DEFAULT,
-                 L"  GetTime                   : %X\n"
-                 L"  SetTime                   : %X\n"
-                 L"  GetWakeupTime             : %X\n"
-                 L"  SetWakeupTime             : %X\n"
-                 L"  SetVirtualAddressMap      : %X\n"
-                 L"  ConvertPointer            : %X\n"
-                 L"  GetVariable               : %X\n"
-                 L"  GetNextVariableName       : %X\n"
-                 L"  SetVariable               : %X\n",
-                 gtRT->GetTime,
-                 gtRT->SetTime,
-                 gtRT->GetWakeupTime,
-                 gtRT->SetWakeupTime,
-                 gtRT->SetVirtualAddressMap,
-                 gtRT->ConvertPointer,
-                 gtRT->GetVariable,
-                 gtRT->GetNextVariableName,
-                 gtRT->SetVariable
-                 );
-
-  StandardLib->RecordMessage (
-                 StandardLib,
-                 EFI_VERBOSE_LEVEL_DEFAULT,
-                 L"  GetNextHighMonotonicCount : %X\n"
-                 L"  ResetSystem               : %X\n",
-                 gtRT->GetNextHighMonotonicCount,
-                 gtRT->ResetSystem
-                 );
-
-  //
-  // Done
-  //
-  return EFI_SUCCESS;
-}
-
-EFI_STATUS
-CheckLoadedImageProtocol (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib
-  )
-{
-  EFI_STATUS                  Status;
-  EFI_LOADED_IMAGE_PROTOCOL   *LoadedImage;
-  EFI_TEST_ASSERTION          AssertionType;
-
-  //
-  // Check the LOADED_IMAGE protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiLoadedImageProtocolGuid,
-                   NULL,
-                   (VOID **) &LoadedImage
-                   );
-
-  if (!EFI_ERROR (Status)) {
-    AssertionType = EFI_TEST_ASSERTION_PASSED;
-  } else {
-    AssertionType = EFI_TEST_ASSERTION_FAILED;
-  }
-
-  StandardLib->RecordAssertion (
-                 StandardLib,
-                 AssertionType,
-                 gEfiCompliantBbTestRequiredAssertionGuid004,
-                 L"EFI Compliant - LOADED_IMAGE protocol must exist",
-                 L"%a:%d:Status - %r, Expected - %r",
-                 __FILE__,
-                 (UINTN)__LINE__,
-                 Status,
-                 EFI_SUCCESS
-                 );
-
-  //
-  // Done
-  //
-  return EFI_SUCCESS;
-}
-
-EFI_STATUS
-CheckDevicePathProtocol (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib
-  )
-{
-  EFI_STATUS                Status;
-  EFI_DEVICE_PATH_PROTOCOL  *DevicePath;
-  EFI_TEST_ASSERTION        AssertionType;
-
-  //
-  // Originally the test is designed to disconnect all EFI 1.10 drivers and
-  // make sure at least one device path exists. But it may change the test
-  // environment. So here we didn't disconnect all EFI 1.10 drivers.
-  //
-
-  //
-  // Check the DEVICE_PATH protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiDevicePathProtocolGuid,
-                   NULL,
-                   (VOID **) &DevicePath
-                   );
-
-  if (!EFI_ERROR (Status)) {
-    AssertionType = EFI_TEST_ASSERTION_PASSED;
-  } else {
-    AssertionType = EFI_TEST_ASSERTION_FAILED;
-  }
-
-  StandardLib->RecordAssertion (
-                 StandardLib,
-                 AssertionType,
-                 gEfiCompliantBbTestRequiredAssertionGuid005,
-                 L"EFI Compliant - DEVICE_PATH protocol must exist",
-                 L"%a:%d:Status - %r, Expected - %r",
-                 __FILE__,
-                 (UINTN)__LINE__,
-                 Status,
-                 EFI_SUCCESS
-                 );
-
-  //
-  // Done
-  //
-  return EFI_SUCCESS;
-}
-
-EFI_STATUS
-CheckDecompressProtocol (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib
-  )
-{
-  EFI_STATUS                Status;
-  EFI_DECOMPRESS_PROTOCOL   *Decompress;
-  EFI_TEST_ASSERTION        AssertionType;
-
-  //
-  // Check the DECOMPRESS protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiDecompressProtocolGuid,
-                   NULL,
-                   (VOID **) &Decompress
-                   );
-
-  if ((Status                 == EFI_SUCCESS) &&
-      (Decompress->GetInfo    != NULL       ) &&
-      (Decompress->Decompress != NULL       )) {
-    AssertionType = EFI_TEST_ASSERTION_PASSED;
-  } else {
-    AssertionType = EFI_TEST_ASSERTION_FAILED;
-  }
-
-  StandardLib->RecordAssertion (
-                 StandardLib,
-                 AssertionType,
-                 gEfiCompliantBbTestRequiredAssertionGuid006,
-                 L"EFI Compliant - DECOMPRESS protocol must exist",
-                 L"%a:%d:Status - %r, Expected - %r",
-                 __FILE__,
-                 (UINTN)__LINE__,
-                 Status,
-                 EFI_SUCCESS
-                 );
-
-  //
-  // Record the entire DECOMPRESS protocol
-  //
-  if (!EFI_ERROR (Status)) {
-    StandardLib->RecordMessage (
-                   StandardLib,
-                   EFI_VERBOSE_LEVEL_DEFAULT,
-                   L"  GetInfo    : %X\n"
-                   L"  Decompress : %X\n",
-                   Decompress->GetInfo,
-                   Decompress->Decompress
-                   );
-  }
-
-  //
-  // Done
-  //
-  return EFI_SUCCESS;
-}
-
-EFI_STATUS
-CheckEbcProtocol (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib
-  )
-{
-  EFI_STATUS          Status;
-  EFI_EBC_PROTOCOL    *Ebc;
-  EFI_TEST_ASSERTION  AssertionType;
-
-  //
-  // Check the EBC Interpreter protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiEbcProtocolGuid,
-                   NULL,
-                   (VOID **) &Ebc
-                   );
-
-  if ((Status                   == EFI_SUCCESS) &&
-      (Ebc->CreateThunk         != NULL       ) &&
-      (Ebc->UnloadImage         != NULL       ) &&
-      (Ebc->RegisterICacheFlush != NULL       ) &&
-      (Ebc->GetVersion          != NULL       ))  {
-    AssertionType = EFI_TEST_ASSERTION_PASSED;
-  } else {
-    AssertionType = EFI_TEST_ASSERTION_FAILED;
-  }
-
-  StandardLib->RecordAssertion (
-                 StandardLib,
-                 AssertionType,
-                 gEfiCompliantBbTestRequiredAssertionGuid007,
-                 L"EFI Compliant - EBC Interpreter protocol must exist",
-                 L"%a:%d:Status - %r, Expected - %r",
-                 __FILE__,
-                 (UINTN)__LINE__,
-                 Status,
-                 EFI_SUCCESS
-                 );
-
-  //
-  // Record the entire EBC Interpreter protocol
-  //
-  if (!EFI_ERROR (Status)) {
-    StandardLib->RecordMessage (
-                   StandardLib,
-                   EFI_VERBOSE_LEVEL_DEFAULT,
-                   L"  CreateThunk         : %X\n"
-                   L"  UnloadImage         : %X\n"
-                   L"  RegisterICacheFlush : %X\n"
-                   L"  GetVersion          : %X\n",
-                   Ebc->CreateThunk,
-                   Ebc->UnloadImage,
-                   Ebc->RegisterICacheFlush,
-                   Ebc->GetVersion
-                   );
-  }
-
-  //
-  // EBC Image Execution test will be included in the Protocol's Black-Box Test
-  //
-
-  //
-  // Done
-  //
-  return EFI_SUCCESS;
-}
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestSupport_efi.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestSupport_efi.c
deleted file mode 100644
index 9c922dc..0000000
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestSupport_efi.c
+++ /dev/null
@@ -1,390 +0,0 @@
-/** @file
-
-  Copyright 2006 - 2010 Unified EFI, Inc.<BR>
-  Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
-
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at 
-  http://opensource.org/licenses/bsd-license.php
- 
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
- 
-**/
-/*++
-
-Module Name:
-
-  EfiCompliantBbTestSupport.c
-
-Abstract:
-
-  Support services for EFI Compliant Black-Box Test.
-
---*/
-
-#include "SctLib.h"
-#include "EfiCompliantBbTestMain_efi.h"
-
-//
-// Module variables
-//
-
-UINT32  mCrcTable[256] = {
-  0x00000000,
-  0x77073096,
-  0xEE0E612C,
-  0x990951BA,
-  0x076DC419,
-  0x706AF48F,
-  0xE963A535,
-  0x9E6495A3,
-  0x0EDB8832,
-  0x79DCB8A4,
-  0xE0D5E91E,
-  0x97D2D988,
-  0x09B64C2B,
-  0x7EB17CBD,
-  0xE7B82D07,
-  0x90BF1D91,
-  0x1DB71064,
-  0x6AB020F2,
-  0xF3B97148,
-  0x84BE41DE,
-  0x1ADAD47D,
-  0x6DDDE4EB,
-  0xF4D4B551,
-  0x83D385C7,
-  0x136C9856,
-  0x646BA8C0,
-  0xFD62F97A,
-  0x8A65C9EC,
-  0x14015C4F,
-  0x63066CD9,
-  0xFA0F3D63,
-  0x8D080DF5,
-  0x3B6E20C8,
-  0x4C69105E,
-  0xD56041E4,
-  0xA2677172,
-  0x3C03E4D1,
-  0x4B04D447,
-  0xD20D85FD,
-  0xA50AB56B,
-  0x35B5A8FA,
-  0x42B2986C,
-  0xDBBBC9D6,
-  0xACBCF940,
-  0x32D86CE3,
-  0x45DF5C75,
-  0xDCD60DCF,
-  0xABD13D59,
-  0x26D930AC,
-  0x51DE003A,
-  0xC8D75180,
-  0xBFD06116,
-  0x21B4F4B5,
-  0x56B3C423,
-  0xCFBA9599,
-  0xB8BDA50F,
-  0x2802B89E,
-  0x5F058808,
-  0xC60CD9B2,
-  0xB10BE924,
-  0x2F6F7C87,
-  0x58684C11,
-  0xC1611DAB,
-  0xB6662D3D,
-  0x76DC4190,
-  0x01DB7106,
-  0x98D220BC,
-  0xEFD5102A,
-  0x71B18589,
-  0x06B6B51F,
-  0x9FBFE4A5,
-  0xE8B8D433,
-  0x7807C9A2,
-  0x0F00F934,
-  0x9609A88E,
-  0xE10E9818,
-  0x7F6A0DBB,
-  0x086D3D2D,
-  0x91646C97,
-  0xE6635C01,
-  0x6B6B51F4,
-  0x1C6C6162,
-  0x856530D8,
-  0xF262004E,
-  0x6C0695ED,
-  0x1B01A57B,
-  0x8208F4C1,
-  0xF50FC457,
-  0x65B0D9C6,
-  0x12B7E950,
-  0x8BBEB8EA,
-  0xFCB9887C,
-  0x62DD1DDF,
-  0x15DA2D49,
-  0x8CD37CF3,
-  0xFBD44C65,
-  0x4DB26158,
-  0x3AB551CE,
-  0xA3BC0074,
-  0xD4BB30E2,
-  0x4ADFA541,
-  0x3DD895D7,
-  0xA4D1C46D,
-  0xD3D6F4FB,
-  0x4369E96A,
-  0x346ED9FC,
-  0xAD678846,
-  0xDA60B8D0,
-  0x44042D73,
-  0x33031DE5,
-  0xAA0A4C5F,
-  0xDD0D7CC9,
-  0x5005713C,
-  0x270241AA,
-  0xBE0B1010,
-  0xC90C2086,
-  0x5768B525,
-  0x206F85B3,
-  0xB966D409,
-  0xCE61E49F,
-  0x5EDEF90E,
-  0x29D9C998,
-  0xB0D09822,
-  0xC7D7A8B4,
-  0x59B33D17,
-  0x2EB40D81,
-  0xB7BD5C3B,
-  0xC0BA6CAD,
-  0xEDB88320,
-  0x9ABFB3B6,
-  0x03B6E20C,
-  0x74B1D29A,
-  0xEAD54739,
-  0x9DD277AF,
-  0x04DB2615,
-  0x73DC1683,
-  0xE3630B12,
-  0x94643B84,
-  0x0D6D6A3E,
-  0x7A6A5AA8,
-  0xE40ECF0B,
-  0x9309FF9D,
-  0x0A00AE27,
-  0x7D079EB1,
-  0xF00F9344,
-  0x8708A3D2,
-  0x1E01F268,
-  0x6906C2FE,
-  0xF762575D,
-  0x806567CB,
-  0x196C3671,
-  0x6E6B06E7,
-  0xFED41B76,
-  0x89D32BE0,
-  0x10DA7A5A,
-  0x67DD4ACC,
-  0xF9B9DF6F,
-  0x8EBEEFF9,
-  0x17B7BE43,
-  0x60B08ED5,
-  0xD6D6A3E8,
-  0xA1D1937E,
-  0x38D8C2C4,
-  0x4FDFF252,
-  0xD1BB67F1,
-  0xA6BC5767,
-  0x3FB506DD,
-  0x48B2364B,
-  0xD80D2BDA,
-  0xAF0A1B4C,
-  0x36034AF6,
-  0x41047A60,
-  0xDF60EFC3,
-  0xA867DF55,
-  0x316E8EEF,
-  0x4669BE79,
-  0xCB61B38C,
-  0xBC66831A,
-  0x256FD2A0,
-  0x5268E236,
-  0xCC0C7795,
-  0xBB0B4703,
-  0x220216B9,
-  0x5505262F,
-  0xC5BA3BBE,
-  0xB2BD0B28,
-  0x2BB45A92,
-  0x5CB36A04,
-  0xC2D7FFA7,
-  0xB5D0CF31,
-  0x2CD99E8B,
-  0x5BDEAE1D,
-  0x9B64C2B0,
-  0xEC63F226,
-  0x756AA39C,
-  0x026D930A,
-  0x9C0906A9,
-  0xEB0E363F,
-  0x72076785,
-  0x05005713,
-  0x95BF4A82,
-  0xE2B87A14,
-  0x7BB12BAE,
-  0x0CB61B38,
-  0x92D28E9B,
-  0xE5D5BE0D,
-  0x7CDCEFB7,
-  0x0BDBDF21,
-  0x86D3D2D4,
-  0xF1D4E242,
-  0x68DDB3F8,
-  0x1FDA836E,
-  0x81BE16CD,
-  0xF6B9265B,
-  0x6FB077E1,
-  0x18B74777,
-  0x88085AE6,
-  0xFF0F6A70,
-  0x66063BCA,
-  0x11010B5C,
-  0x8F659EFF,
-  0xF862AE69,
-  0x616BFFD3,
-  0x166CCF45,
-  0xA00AE278,
-  0xD70DD2EE,
-  0x4E048354,
-  0x3903B3C2,
-  0xA7672661,
-  0xD06016F7,
-  0x4969474D,
-  0x3E6E77DB,
-  0xAED16A4A,
-  0xD9D65ADC,
-  0x40DF0B66,
-  0x37D83BF0,
-  0xA9BCAE53,
-  0xDEBB9EC5,
-  0x47B2CF7F,
-  0x30B5FFE9,
-  0xBDBDF21C,
-  0xCABAC28A,
-  0x53B39330,
-  0x24B4A3A6,
-  0xBAD03605,
-  0xCDD70693,
-  0x54DE5729,
-  0x23D967BF,
-  0xB3667A2E,
-  0xC4614AB8,
-  0x5D681B02,
-  0x2A6F2B94,
-  0xB40BBE37,
-  0xC30C8EA1,
-  0x5A05DF1B,
-  0x2D02EF8D
-};
-
-//
-// External functions implementation
-//
-
-EFI_STATUS
-OpenIniFile (
-  IN  EFI_TEST_PROFILE_LIBRARY_PROTOCOL   *ProfileLib,
-  IN  CHAR16                              *IniPathName,
-  IN  CHAR16                              *IniFileName,
-  OUT EFI_INI_FILE_HANDLE                 *IniFile
-  )
-{
-  EFI_STATUS                Status;
-  EFI_DEVICE_PATH_PROTOCOL  *DevicePath;
-  CHAR16                    *FilePath;
-  CHAR16                    *IniFilePath;
-
-  //
-  // Get the system device path
-  //
-  Status = ProfileLib->EfiGetSystemDevicePath (
-                         ProfileLib,
-                         &DevicePath,
-                         &FilePath
-                         );
-  if (EFI_ERROR (Status)) {
-    return Status;
-  }
-
-  //
-  // Generate the INI file path
-  //
-  IniFilePath = SctPoolPrint (
-                  L"%s\\%s\\%s",
-                  FilePath,
-                  IniPathName,
-                  IniFileName
-                  );
-  if (IniFilePath == NULL) {
-    gtBS->FreePool (DevicePath);
-    gtBS->FreePool (FilePath);
-    return EFI_OUT_OF_RESOURCES;
-  }
-
-  //
-  // Open the INI file
-  //
-  Status = ProfileLib->EfiIniOpen (
-                         ProfileLib,
-                         DevicePath,
-                         IniFilePath,
-                         IniFile
-                         );
-  if (EFI_ERROR (Status)) {
-    *IniFile = NULL;
-  }
-
-  //
-  // Free resources
-  //
-  gtBS->FreePool (DevicePath);
-  gtBS->FreePool (FilePath);
-  gtBS->FreePool (IniFilePath);
-
-  //
-  // Done
-  //
-  return EFI_SUCCESS;
-}
-
-EFI_STATUS
-CloseIniFile (
-  IN  EFI_TEST_PROFILE_LIBRARY_PROTOCOL   *ProfileLib,
-  IN  EFI_INI_FILE_HANDLE                 IniFile
-  )
-{
-  EFI_STATUS  Status;
-
-  //
-  // Check parameters
-  //
-  if (IniFile == NULL) {
-    return EFI_SUCCESS;
-  }
-
-  //
-  // Close the INI file
-  //
-  Status = ProfileLib->EfiIniClose (
-                         ProfileLib,
-                         IniFile
-                         );
-
-  //
-  // Done
-  //
-  return Status;
-}
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTest_efi.inf b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTest_efi.inf
deleted file mode 100644
index 6d99dc1..0000000
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTest_efi.inf
+++ /dev/null
@@ -1,56 +0,0 @@
-## @file
-#
-#  Copyright 2006 - 2012 Unified EFI, Inc.<BR>
-#  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.<BR>
-#
-#  This program and the accompanying materials
-#  are licensed and made available under the terms and conditions of the BSD License
-#  which accompanies this distribution.  The full text of the license may be found at 
-#  http://opensource.org/licenses/bsd-license.php
-# 
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-# 
-##
-#/*++
-#
-# Module Name:
-#
-#   EfiCompliantBbTest_efi.inf
-#
-# Abstract:
-#
-#   Component description file for EFI Compliant Black-Box Test.
-#
-#--*/
-
-[Defines]
-  INF_VERSION          = 0x00010005
-  BASE_NAME            = EfiCompliantBbTest
-  FILE_GUID            = B45574E7-3848-4917-853F-931AC4FC0225
-  MODULE_TYPE          = UEFI_DRIVER
-  VERSION_STRING       = 1.0
-  ENTRY_POINT          = InitializeEfiCompliantBbTest
-
-[Sources.common]
-  EfiCompliantBBTestMain_efi.c
-  EfiCompliantBBTestMain_efi.h
-  EfiCompliantBBTestRequired_efi.c
-  EfiCompliantBBTestPlatform_efi.c
-  EfiCompliantBBTestDriver_efi.c
-  EfiCompliantBBTestSupport_efi.c
-  Guid_efi.c
-  Guid_efi.h
-
-[Packages]
-  MdePkg/MdePkg.dec
-  SctPkg/SctPkg.dec
-  SctPkg/UEFI/UEFI.dec
-
-[LibraryClasses]
-  UefiDriverEntryPoint
-  SctLib
-  EfiTestLib
-
-[Protocols]
-  gEfiDebugPortProtocolGuid
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/Guid_efi.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/Guid_efi.c
deleted file mode 100644
index d2963cc..0000000
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/Guid_efi.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/** @file
-
-  Copyright 2006 - 2012 Unified EFI, Inc.<BR>
-  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.<BR>
-
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at 
-  http://opensource.org/licenses/bsd-license.php
- 
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
- 
-**/
-/*++
-
-Module Name:
-
-  guid.c
-
-Abstract:
-
-  GUIDs for EFI test assertion.
-
---*/
-
-#include "Efi.h"
-#include "Guid_efi.h"
-
-
-EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid001 = EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_001_GUID;
-
-EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid002 = EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_002_GUID;
-
-EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid003 = EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_003_GUID;
-
-EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid004 = EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_004_GUID;
-
-EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid005 = EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_005_GUID;
-
-EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid006 = EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_006_GUID;
-
-EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid007 = EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_007_GUID;
-
-EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid008 = EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_008_GUID;
-
-EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid009 = EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_009_GUID;
-
-EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid010 = EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_010_GUID;
-
-EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid011 = EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_011_GUID;
-
-EFI_GUID gEfiCompliantBbTestRequiredAssertionGuid001 = EFI_TEST_EFICOMPLIANTBBTESTREQUIRED_ASSERTION_001_GUID;
-
-EFI_GUID gEfiCompliantBbTestRequiredAssertionGuid002 = EFI_TEST_EFICOMPLIANTBBTESTREQUIRED_ASSERTION_002_GUID;
-
-EFI_GUID gEfiCompliantBbTestRequiredAssertionGuid003 = EFI_TEST_EFICOMPLIANTBBTESTREQUIRED_ASSERTION_003_GUID;
-
-EFI_GUID gEfiCompliantBbTestRequiredAssertionGuid004 = EFI_TEST_EFICOMPLIANTBBTESTREQUIRED_ASSERTION_004_GUID;
-
-EFI_GUID gEfiCompliantBbTestRequiredAssertionGuid005 = EFI_TEST_EFICOMPLIANTBBTESTREQUIRED_ASSERTION_005_GUID;
-
-EFI_GUID gEfiCompliantBbTestRequiredAssertionGuid006 = EFI_TEST_EFICOMPLIANTBBTESTREQUIRED_ASSERTION_006_GUID;
-
-EFI_GUID gEfiCompliantBbTestRequiredAssertionGuid007 = EFI_TEST_EFICOMPLIANTBBTESTREQUIRED_ASSERTION_007_GUID;
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/Guid_efi.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/Guid_efi.h
deleted file mode 100644
index ea1c52f..0000000
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/Guid_efi.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/** @file
-
-  Copyright 2006 - 2016 Unified EFI, Inc.<BR>
-  Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>
-
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at 
-  http://opensource.org/licenses/bsd-license.php
- 
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
- 
-**/
-/*++
-
-Module Name:
-
-  guid.h
-
-Abstract:
-
-  GUIDs auto-generated for EFI test assertion.
-
---*/
-
-
-#define EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_001_GUID \
-{ 0x8f7556c2, 0x4665, 0x4353, {0xa3, 0xaf, 0x9c, 0x00, 0x5a, 0x1e, 0x63, 0xe1 }}
-
-extern EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid001;
-
-#define EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_002_GUID \
-{ 0x72ba0e86, 0x58e5, 0x48dd, {0x85, 0x29, 0x88, 0xc6, 0x83, 0x83, 0x11, 0x8d }}
-
-extern EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid002;
-
-#define EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_003_GUID \
-{ 0x18670db1, 0x89fb, 0x4de4, {0xb1, 0x0f, 0x89, 0x8e, 0x04, 0x7d, 0x95, 0x2a }}
-
-extern EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid003;
-
-#define EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_004_GUID \
-{ 0xbf38a3fd, 0x58ac, 0x419a, {0xab, 0xc2, 0xc6, 0x0b, 0xae, 0x9c, 0xfe, 0x67 }}
-
-extern EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid004;
-
-#define EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_005_GUID \
-{ 0x98551ae7, 0x5020, 0x4ddd, {0x86, 0x1a, 0xcf, 0xff, 0xb4, 0xd6, 0x03, 0x82 }}
-
-extern EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid005;
-
-#define EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_006_GUID \
-{ 0x517bcbeb, 0x4982, 0x4a7e, {0x85, 0x51, 0xca, 0x84, 0x7d, 0xdc, 0x21, 0xc2 }}
-
-extern EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid006;
-
-#define EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_007_GUID \
-{ 0x213a75c9, 0x7f3d, 0x42db, {0xb3, 0x2a, 0x02, 0xdb, 0xd6, 0x98, 0x31, 0x9d }}
-
-extern EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid007;
-
-#define EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_008_GUID \
-{ 0x0ccd5843, 0x5bb5, 0x4fc2, {0xa7, 0x32, 0xdb, 0x17, 0xc4, 0x14, 0xa4, 0x3d }}
-
-extern EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid008;
-
-#define EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_009_GUID \
-{ 0x2b83418f, 0xe7fb, 0x4528, {0xb6, 0xff, 0xc9, 0xd4, 0x87, 0xae, 0x2e, 0xff }}
-
-extern EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid009;
-
-#define EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_010_GUID \
-{ 0x3ee22696, 0x0875, 0x46f4, {0x88, 0x84, 0xba, 0x12, 0x4c, 0x7e, 0xaf, 0xf0 }}
-
-extern EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid010;
-
-#define EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_011_GUID \
-{ 0x329027ce, 0x406e, 0x48c8, {0x8a, 0xc1, 0xa0, 0x2c, 0x1a, 0x6e, 0x39, 0x83 }}
-
-extern EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid011;
-
-#define EFI_TEST_EFICOMPLIANTBBTESTREQUIRED_ASSERTION_001_GUID \
-{ 0xf6a871e3, 0xef8a, 0x420f, {0x82, 0x01, 0x35, 0xb6, 0x1c, 0xe2, 0xe8, 0xdb }}
-
-extern EFI_GUID gEfiCompliantBbTestRequiredAssertionGuid001;
-
-#define EFI_TEST_EFICOMPLIANTBBTESTREQUIRED_ASSERTION_002_GUID \
-{ 0xaddab6ed, 0x5a17, 0x4327, {0x8f, 0xb1, 0x72, 0x93, 0x3d, 0x1a, 0x7b, 0xba }}
-
-extern EFI_GUID gEfiCompliantBbTestRequiredAssertionGuid002;
-
-#define EFI_TEST_EFICOMPLIANTBBTESTREQUIRED_ASSERTION_003_GUID \
-{ 0x13a20958, 0xc860, 0x452f, {0xb9, 0xa2, 0xe6, 0xd9, 0x96, 0x41, 0x92, 0x24 }}
-
-extern EFI_GUID gEfiCompliantBbTestRequiredAssertionGuid003;
-
-#define EFI_TEST_EFICOMPLIANTBBTESTREQUIRED_ASSERTION_004_GUID \
-{ 0xa82f8d56, 0x1476, 0x41f1, {0xba, 0xc4, 0x97, 0x59, 0x79, 0x9f, 0x97, 0xf3 }}
-
-extern EFI_GUID gEfiCompliantBbTestRequiredAssertionGuid004;
-
-#define EFI_TEST_EFICOMPLIANTBBTESTREQUIRED_ASSERTION_005_GUID \
-{ 0xf61f0f0a, 0x64fe, 0x40a6, {0x9d, 0x7c, 0x07, 0x46, 0xa2, 0x30, 0x24, 0x5f }}
-
-extern EFI_GUID gEfiCompliantBbTestRequiredAssertionGuid005;
-
-#define EFI_TEST_EFICOMPLIANTBBTESTREQUIRED_ASSERTION_006_GUID \
-{ 0x02c017d7, 0x1557, 0x47d9, {0xbc, 0xe9, 0x87, 0x18, 0x2d, 0x07, 0x91, 0x0c }}
-
-extern EFI_GUID gEfiCompliantBbTestRequiredAssertionGuid006;
-
-#define EFI_TEST_EFICOMPLIANTBBTESTREQUIRED_ASSERTION_007_GUID \
-{ 0x2283aa73, 0xa851, 0x4009, {0x87, 0xc0, 0x4a, 0x46, 0x2f, 0xae, 0x36, 0xc3 }}
-
-extern EFI_GUID gEfiCompliantBbTestRequiredAssertionGuid007;
-- 
2.9.0.windows.1



^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [edk2-test][Patch] uefi-sct/SctPkg:Remove old unused files in EfiCompliant test
  2018-11-21  2:13 [edk2-test][Patch] uefi-sct/SctPkg:Remove old unused files in EfiCompliant test Eric Jin
@ 2018-11-21 14:47 ` Supreeth Venkatesh
  0 siblings, 0 replies; 2+ messages in thread
From: Supreeth Venkatesh @ 2018-11-21 14:47 UTC (permalink / raw)
  To: Eric Jin, edk2-devel@lists.01.org

Reviewed-by: Supreeth Venkatesh <supreeth.venkatesh@arm.com>

-----Original Message-----
From: Eric Jin <eric.jin@intel.com>
Sent: Tuesday, November 20, 2018 8:13 PM
To: edk2-devel@lists.01.org
Cc: Supreeth Venkatesh <Supreeth.Venkatesh@arm.com>
Subject: [edk2-test][Patch] uefi-sct/SctPkg:Remove old unused files in EfiCompliant test

Cc: Supreeth Venkatesh <supreeth.venkatesh@arm.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Eric Jin <eric.jin@intel.com>
---
 .../BlackBoxTest/EfiCompliantBBTestDriver_efi.c    |   64 -
 .../BlackBoxTest/EfiCompliantBBTestMain_efi.c      |  126 --
 .../BlackBoxTest/EfiCompliantBBTestMain_efi.h      |  117 --
 .../BlackBoxTest/EfiCompliantBBTestPlatform_efi.c  | 1441 --------------------
 .../BlackBoxTest/EfiCompliantBBTestRequired_efi.c  |  820 -----------
 .../BlackBoxTest/EfiCompliantBBTestSupport_efi.c   |  390 ------
 .../BlackBoxTest/EfiCompliantBBTest_efi.inf        |   56 -
 .../Generic/EfiCompliant/BlackBoxTest/Guid_efi.c   |   65 -
 .../Generic/EfiCompliant/BlackBoxTest/Guid_efi.h   |  116 --
 9 files changed, 3195 deletions(-)
 delete mode 100644 uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestDriver_efi.c
 delete mode 100644 uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestMain_efi.c
 delete mode 100644 uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestMain_efi.h
 delete mode 100644 uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestPlatform_efi.c
 delete mode 100644 uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestRequired_efi.c
 delete mode 100644 uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestSupport_efi.c
 delete mode 100644 uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTest_efi.inf
 delete mode 100644 uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/Guid_efi.c
 delete mode 100644 uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/Guid_efi.h

diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestDriver_efi.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestDriver_efi.c
deleted file mode 100644
index 5db3eae..0000000
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestDriver_efi.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/** @file
-
-  Copyright 2006 - 2010 Unified EFI, Inc.<BR>
-  Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
-
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-/*++
-
-Module Name:
-
-  EfiCompliantBbTestDriver.c
-
-Abstract:
-
-  Check the driver specific elements in EFI Spec.
-
---*/
-
-//
-// Includes
-//
-
-#include "SctLib.h"
-#include "EfiCompliantBbTestMain_efi.h"
-
-//
-// Module definitions
-//
-
-#define SECTION_NAME_DRIVER_SPECIFIC        L"Driver Specific"
-
-//
-// External functions implementation
-//
-
-EFI_STATUS
-DriverSpecificElementsBbTest (
-  IN EFI_BB_TEST_PROTOCOL         *This,
-  IN VOID                         *ClientInterface,
-  IN EFI_TEST_LEVEL               TestLevel,
-  IN EFI_HANDLE                   SupportHandle
-  )
-/*++
-
-Routine Description:
-
-  Check the driver specific elements, which defined in the EFI spec 1.10,
-  section 2.6.3.
-
-  We didn't find a good way to test this item. So currently it is commented in
-  the test entry point definitions of TestMain.c.
-
---*/
-{
-  return EFI_UNSUPPORTED;
-}
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestMain_efi.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestMain_efi.c
deleted file mode 100644
index 31ee6c4..0000000
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestMain_efi.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/** @file
-
-  Copyright 2006 - 2010 Unified EFI, Inc.<BR>
-  Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
-
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-/*++
-
-Module Name:
-
-  EfiCompliantBbTestMain.c
-
-Abstract:
-
-  EFI Compliant Black-Box Test.
-
---*/
-
-#include "SctLib.h"
-#include "EfiCompliantBbTestMain_efi.h"
-
-//
-// Global variables
-//
-
-EFI_BB_TEST_PROTOCOL_FIELD gBBTestProtocolField = {
-  EFI_COMPLIANT_BB_TEST_REVISION,
-  EFI_COMPLIANT_BB_TEST_GUID,
-  L"EFI Compliant Test",
-  L"UEFI 2.0 Compliant Black-Box Test"
-};
-
-EFI_GUID gSupportProtocolGuid[] = {
-  EFI_STANDARD_TEST_LIBRARY_GUID,
-  EFI_TEST_PROFILE_LIBRARY_GUID,
-  EFI_NULL_GUID
-};
-
-EFI_BB_TEST_ENTRY_FIELD gBBTestEntryField[] = {
-  {
-    REQUIRED_ELEMENTS_BB_TEST_GUID,
-    L"Required Elements",
-    L"Check the required elements defined in the EFI spec 2.6.1",
-    EFI_TEST_LEVEL_DEFAULT,
-    gSupportProtocolGuid,
-    EFI_TEST_CASE_AUTO,
-    RequiredElementsBbTest
-  },
-  {
-    PLATFORM_SPECIFIC_ELEMENTS_BB_TEST_GUID,
-    L"Platform Specific Elements",
-    L"Check the platform specific elements defined in the EFI spec 2.6.2",
-    EFI_TEST_LEVEL_DEFAULT,
-    gSupportProtocolGuid,
-    EFI_TEST_CASE_AUTO,
-    PlatformSpecificElementsBbTest
-  },
-  //
-  // NOTE: We didn't find a good way to check the driver specific elements
-  // defined in the EFI spec 2.6.3.
-  //
-  /*
-  {
-    DRIVER_SPECIFIC_ELEMENTS_BB_TEST_GUID,
-    L"Driver Specific Elements",
-    L"Check the driver specific elements defined in the EFI spec 2.6.3",
-    EFI_TEST_LEVEL_DEFAULT,
-    gSupportProtocolGuid,
-    EFI_TEST_CASE_AUTO,
-    DriverSpecificElementsBbTest
-  },
-  */
-  EFI_NULL_GUID
-};
-
-EFI_BB_TEST_PROTOCOL *gBBTestProtocolInterface;
-
-//
-// Unload function declaration
-//
-
-EFI_STATUS
-EfiCompliantBbTestUnload (
-  IN EFI_HANDLE         ImageHandle
-  );
-
-//
-// Entry point
-//
-
-EFI_STATUS
-InitializeEfiCompliantBbTest (
-  IN EFI_HANDLE         ImageHandle,
-  IN EFI_SYSTEM_TABLE   *SystemTable
-  )
-{
-  EfiInitializeTestLib (ImageHandle, SystemTable);
-  SctInitializeLib (ImageHandle, SystemTable);
-
-  return EfiInitAndInstallBBTestInterface (
-           &ImageHandle,
-           &gBBTestProtocolField,
-           gBBTestEntryField,
-           EfiCompliantBbTestUnload,
-           &gBBTestProtocolInterface
-           );
-}
-
-EFI_STATUS
-EfiCompliantBbTestUnload (
-  IN EFI_HANDLE         ImageHandle
-  )
-{
-  return EfiUninstallAndFreeBBTestInterface (
-           ImageHandle,
-           gBBTestProtocolInterface
-           );
-}
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestMain_efi.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestMain_efi.h
deleted file mode 100644
index 287af47..0000000
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestMain_efi.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/** @file
-
-  Copyright 2006 - 2016 Unified EFI, Inc.<BR>
-  Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>
-
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-/*++
-
-Module Name:
-
-  EfiCompliantBbTestMain.h
-
-Abstract:
-
-  EFI Compliant Black-Box Test.
-
---*/
-
-#ifndef _EFI_COMPLIANT_BB_TEST_MAIN_H_
-#define _EFI_COMPLIANT_BB_TEST_MAIN_H_
-
-//
-// Includes
-//
-
-#include "SctLib.h"
-#include <Library/EfiTestLib.h>
-#include "Guid_efi.h"
-
-#include EFI_TEST_PROTOCOL_DEFINITION (BbTest)
-#include EFI_TEST_PROTOCOL_DEFINITION (StandardTestLibrary)
-#include EFI_TEST_PROTOCOL_DEFINITION (TestProfileLibrary)
-
-//
-// Definitions
-//
-
-#define EFI_COMPLIANT_BB_TEST_REVISION      0x00010001
-
-// {4796995E-528F-4e7e-8BAF-FA4A931D2502}
-#define EFI_COMPLIANT_BB_TEST_GUID          \
-  { 0x4796995e, 0x528f, 0x4e7e, {0x8b, 0xaf, 0xfa, 0x4a, 0x93, 0x1d, 0x25, 0x02 }}
-
-#define EFI_COMPLIANT_BB_TEST_INI_PATH      L"Dependency\\EfiCompliantBBTest"
-#define EFI_COMPLIANT_BB_TEST_INI_FILE      L"EfiCompliant.Ini"
-
-//
-// Prototype of conformance tests
-//
-
-EFI_STATUS
-RequiredElementsBbTest (
-  IN EFI_BB_TEST_PROTOCOL         *This,
-  IN VOID                         *ClientInterface,
-  IN EFI_TEST_LEVEL               TestLevel,
-  IN EFI_HANDLE                   SupportHandle
-  );
-
-EFI_STATUS
-PlatformSpecificElementsBbTest (
-  IN EFI_BB_TEST_PROTOCOL         *This,
-  IN VOID                         *ClientInterface,
-  IN EFI_TEST_LEVEL               TestLevel,
-  IN EFI_HANDLE                   SupportHandle
-  );
-
-EFI_STATUS
-DriverSpecificElementsBbTest (
-  IN EFI_BB_TEST_PROTOCOL         *This,
-  IN VOID                         *ClientInterface,
-  IN EFI_TEST_LEVEL               TestLevel,
-  IN EFI_HANDLE                   SupportHandle
-  );
-
-//
-// Support services
-//
-
-EFI_STATUS
-OpenIniFile (
-  IN  EFI_TEST_PROFILE_LIBRARY_PROTOCOL   *ProfileLib,
-  IN  CHAR16                              *IniPathName,
-  IN  CHAR16                              *IniFileName,
-  OUT EFI_INI_FILE_HANDLE                 *IniFile
-  );
-
-EFI_STATUS
-CloseIniFile (
-  IN  EFI_TEST_PROFILE_LIBRARY_PROTOCOL   *ProfileLib,
-  IN  EFI_INI_FILE_HANDLE                 IniFile
-  );
-
-//
-// GUIDs for the test entry points
-//
-
-// {117C9ABC-489D-4504-ACDB-12AACE8F505B}
-#define REQUIRED_ELEMENTS_BB_TEST_GUID                \
-  { 0x117c9abc, 0x489d, 0x4504, {0xac, 0xdb, 0x12, 0xaa, 0xce, 0x8f, 0x50, 0x5b }}
-
-// {A0A8BED3-3D6F-4ad8-907A-84D52EE1543B}
-#define PLATFORM_SPECIFIC_ELEMENTS_BB_TEST_GUID       \
-  { 0xa0a8bed3, 0x3d6f, 0x4ad8, {0x90, 0x7a, 0x84, 0xd5, 0x2e, 0xe1, 0x54, 0x3b }}
-
-// {EED18069-2B1F-47c0-9C3C-20D5B070B84C}
-#define DRIVER_SPECIFIC_ELEMENTS_BB_TEST_GUID         \
-  { 0xeed18069, 0x2b1f, 0x47c0, {0x9c, 0x3c, 0x20, 0xd5, 0xb0, 0x70, 0xb8, 0x4c }}
-
-#endif
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestPlatform_efi.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestPlatform_efi.c
deleted file mode 100644
index 5cd541c..0000000
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestPlatform_efi.c
+++ /dev/null
@@ -1,1441 +0,0 @@
-/** @file
-
-  Copyright 2006 - 2016 Unified EFI, Inc.<BR>
-  Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>
-
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-/*++
-
-Module Name:
-
-  EfiCompliantBbTestPlatform.c
-
-Abstract:
-
-  Check the platform specific elements in EFI Spec.
-
---*/
-
-//
-// Includes
-//
-
-#include "SctLib.h"
-#include "EfiCompliantBbTestMain_efi.h"
-#include EFI_PROTOCOL_DEFINITION (SimpleTextIn)
-#include <UEFI/Protocol/SimpleTextOut.h>
-#include <UEFI/Protocol/UgaDraw.h>
-#include EFI_PROTOCOL_DEFINITION (UgaIo)
-#include EFI_PROTOCOL_DEFINITION (SimplePointer)
-#include EFI_PROTOCOL_DEFINITION (BlockIo)
-#include EFI_PROTOCOL_DEFINITION (DiskIo)
-#include EFI_PROTOCOL_DEFINITION (SimpleFileSystem)
-#include EFI_PROTOCOL_DEFINITION (UnicodeCollation)
-#include EFI_PROTOCOL_DEFINITION (SimpleNetwork)
-#include EFI_PROTOCOL_DEFINITION (PxeBaseCode)
-#include EFI_PROTOCOL_DEFINITION (Bis)
-#include EFI_PROTOCOL_DEFINITION (SerialIo)
-#include EFI_PROTOCOL_DEFINITION (PciRootBridgeIo)
-#include EFI_PROTOCOL_DEFINITION (PciIo)
-#include EFI_PROTOCOL_DEFINITION (DeviceIo)
-#include EFI_PROTOCOL_DEFINITION (UsbHostController)
-#include EFI_PROTOCOL_DEFINITION (UsbIo)
-#include EFI_PROTOCOL_DEFINITION (ScsiPassThru)
-#include EFI_PROTOCOL_DEFINITION (DebugSupport)
-#include EFI_PROTOCOL_DEFINITION (DebugPort)
-#include EFI_PROTOCOL_DEFINITION (PlatformDriverOverride)
-
-//
-// Module definitions
-//
-
-#define SECTION_NAME_PLATFORM_SPECIFIC      L"Platform Specific"
-
-//
-// Internal functions declarations
-//
-
-EFI_TEST_ASSERTION
-NeedOneOrWarning (
-  IN BOOLEAN                      ValueA
-  );
-
-EFI_TEST_ASSERTION
-NeedTwoOrWarning (
-  IN BOOLEAN                      ValueA,
-  IN BOOLEAN                      ValueB
-  );
-
-EFI_TEST_ASSERTION
-NeedThreeOrWarning (
-  IN BOOLEAN                      ValueA,
-  IN BOOLEAN                      ValueB,
-  IN BOOLEAN                      ValueC
-  );
-
-EFI_TEST_ASSERTION
-NeedFourOrWarning (
-  IN BOOLEAN                      ValueA,
-  IN BOOLEAN                      ValueB,
-  IN BOOLEAN                      ValueC,
-  IN BOOLEAN                      valueD
-  );
-
-EFI_STATUS
-CheckConsoleProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  );
-
-EFI_STATUS
-CheckGraphicalConsoleProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  );
-
-EFI_STATUS
-CheckPointerProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  );
-
-EFI_STATUS
-CheckBootFromDiskProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  );
-
-EFI_STATUS
-CheckBootFromNetworkProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  );
-
-EFI_STATUS
-CheckUartProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  );
-
-EFI_STATUS
-CheckPciProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  );
-
-EFI_STATUS
-CheckUsbProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  );
-
-EFI_STATUS
-CheckScsiProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  );
-
-EFI_STATUS
-CheckDebugProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  );
-
-EFI_STATUS
-CheckDriverOverrideProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  );
-
-//
-// External functions implementation
-//
-
-EFI_STATUS
-PlatformSpecificElementsBbTest (
-  IN EFI_BB_TEST_PROTOCOL         *This,
-  IN VOID                         *ClientInterface,
-  IN EFI_TEST_LEVEL               TestLevel,
-  IN EFI_HANDLE                   SupportHandle
-  )
-/*++
-
-Routine Description:
-
-  Check the platform specific elements, which defined in the EFI spec 1.10,
-  section 2.6.2.
-
---*/
-{
-  EFI_STATUS                          Status;
-  EFI_STANDARD_TEST_LIBRARY_PROTOCOL  *StandardLib;
-  EFI_TEST_PROFILE_LIBRARY_PROTOCOL   *ProfileLib;
-  EFI_INI_FILE_HANDLE                 IniFile;
-
-  //
-  // Locate the standard test library protocol
-  //
-  Status = gtBS->HandleProtocol (
-                   SupportHandle,
-                   &gEfiStandardTestLibraryGuid,
-                   (VOID **) &StandardLib
-                   );
-  if (EFI_ERROR (Status)) {
-    return Status;
-  }
-
-  //
-  // Locate the test profile library protocol
-  //
-  Status = gtBS->HandleProtocol (
-                   SupportHandle,
-                   &gEfiTestProfileLibraryGuid,
-                   (VOID **) &ProfileLib
-                   );
-  if (EFI_ERROR (Status)) {
-    return Status;
-  }
-
-  //
-  // Open the INI file
-  //
-  Status = OpenIniFile (
-             ProfileLib,
-             EFI_COMPLIANT_BB_TEST_INI_PATH,
-             EFI_COMPLIANT_BB_TEST_INI_FILE,
-             &IniFile
-             );
-  if (EFI_ERROR (Status)) {
-    StandardLib->RecordAssertion (
-                   StandardLib,
-                   EFI_TEST_ASSERTION_WARNING,
-                   gTestGenericFailureGuid,
-                   L"EFI Compliant - Cannot open INI file",
-                   L"%a:%d",
-                   __FILE__,
-                   (UINTN)__LINE__
-                   );
-
-    return Status;
-  }
-
-  //
-  // Check the console protocols
-  //
-  CheckConsoleProtocols (StandardLib, IniFile);
-
-  //
-  // Check the graphical console protocols
-  //
-  CheckGraphicalConsoleProtocols (StandardLib, IniFile);
-
-  //
-  // Check the pointer protocols
-  //
-  CheckPointerProtocols (StandardLib, IniFile);
-
-  //
-  // Check the boot from disk protocols
-  //
-  CheckBootFromDiskProtocols (StandardLib, IniFile);
-
-  //
-  // Check the boot from network protocols
-  //
-  CheckBootFromNetworkProtocols (StandardLib, IniFile);
-
-  //
-  // Check the UART support protocols
-  //
-  CheckUartProtocols (StandardLib, IniFile);
-
-  //
-  // Check the PCI support protocols
-  //
-  CheckPciProtocols (StandardLib, IniFile);
-
-  //
-  // Check the USB support protocols
-  //
-  CheckUsbProtocols (StandardLib, IniFile);
-
-  //
-  // Check the SCSI support protocols
-  //
-  CheckScsiProtocols (StandardLib, IniFile);
-
-  //
-  // Check the Debug support protocols
-  //
-  CheckDebugProtocols (StandardLib, IniFile);
-
-  //
-  // Check the driver override protocols
-  //
-  CheckDriverOverrideProtocols (StandardLib, IniFile);
-
-  //
-  // Close the INI file
-  //
-  CloseIniFile (ProfileLib, IniFile);
-
-  //
-  // Done
-  //
-  return EFI_SUCCESS;
-}
-
-//
-// Internal functions implementation
-//
-
-EFI_TEST_ASSERTION
-NeedOneOrWarning (
-  IN BOOLEAN                      ValueA
-  )
-{
-  if (ValueA) {
-    return EFI_TEST_ASSERTION_PASSED;
-  } else {
-    return EFI_TEST_ASSERTION_WARNING;
-  }
-}
-
-EFI_TEST_ASSERTION
-NeedTwoOrWarning (
-  IN BOOLEAN                      ValueA,
-  IN BOOLEAN                      ValueB
-  )
-{
-  if (ValueA && ValueB) {
-    //
-    // Both are true
-    //
-    return EFI_TEST_ASSERTION_PASSED;
-  }
-
-  if (!ValueA && !ValueB) {
-    //
-    // Both are false
-    //
-    return EFI_TEST_ASSERTION_WARNING;
-  }
-
-  //
-  // In different states
-  //
-  return EFI_TEST_ASSERTION_FAILED;
-}
-
-EFI_TEST_ASSERTION
-NeedThreeOrWarning (
-  IN BOOLEAN                      ValueA,
-  IN BOOLEAN                      ValueB,
-  IN BOOLEAN                      ValueC
-  )
-{
-  if (ValueA && ValueB && ValueC) {
-    //
-    // All are true
-    //
-    return EFI_TEST_ASSERTION_PASSED;
-  }
-
-  if (!ValueA && !ValueB && !ValueC) {
-    //
-    // All are false
-    //
-    return EFI_TEST_ASSERTION_WARNING;
-  }
-
-  //
-  // In different states
-  //
-  return EFI_TEST_ASSERTION_FAILED;
-}
-
-EFI_TEST_ASSERTION
-NeedFourOrWarning (
-  IN BOOLEAN                      ValueA,
-  IN BOOLEAN                      ValueB,
-  IN BOOLEAN                      ValueC,
-  IN BOOLEAN                      ValueD
-  )
-{
-  if (ValueA && ValueB && ValueC && ValueD) {
-    //
-    // All are true
-    //
-    return EFI_TEST_ASSERTION_PASSED;
-  }
-
-  if (!ValueA && !ValueB && !ValueC && !ValueD) {
-    //
-    // All are false
-    //
-    return EFI_TEST_ASSERTION_WARNING;
-  }
-
-  //
-  // In different states
-  //
-  return EFI_TEST_ASSERTION_FAILED;
-}
-
-EFI_STATUS
-CheckConsoleProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  )
-{
-  EFI_STATUS          Status;
-  UINT32              MaxLength;
-  CHAR16              String[10];
-  BOOLEAN             ValueA;
-  BOOLEAN             ValueB;
-  VOID                *Interface;
-  EFI_TEST_ASSERTION  AssertionType;
-
-  //
-  // Check the SIMPLE_INPUT protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiSimpleTextInProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueA = TRUE;
-  } else {
-    ValueA = FALSE;
-  }
-
-  //
-  // Check the SIMPLE_TEXT_OUTPUT protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiSimpleTextOutProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueB = TRUE;
-  } else {
-    ValueB = FALSE;
-  }
-
-  //
-  // Need two or warning
-  //
-  AssertionType = NeedTwoOrWarning (ValueA, ValueB);
-
-  //
-  // For platform-specific elements, throw out a warning in default
-  //
-  if (AssertionType == EFI_TEST_ASSERTION_FAILED) {
-    AssertionType = EFI_TEST_ASSERTION_WARNING;
-  }
-
-  //
-  // If warning, check with INI file to decide they must exist or not
-  //
-  if ((AssertionType == EFI_TEST_ASSERTION_WARNING) &&
-      (IniFile       != NULL               )) {
-    MaxLength = 10;
-
-    Status = IniFile->GetString (
-                        IniFile,
-                        SECTION_NAME_PLATFORM_SPECIFIC,
-                        L"ConsoleDevices",
-                        String,
-                        &MaxLength
-                        );
-    if (!EFI_ERROR (Status) && (SctStriCmp (String, L"yes") == 0)) {
-      AssertionType = EFI_TEST_ASSERTION_FAILED;
-    }
-  }
-
-  //
-  // Record test result
-  //
-  StandardLib->RecordAssertion (
-                 StandardLib,
-                 AssertionType,
-                 gEfiCompliantBbTestPlatformAssertionGuid001,
-                 L"EFI Compliant - Console protocols must be implemented",
-                 L"%a:%d:Text Input - %s, Text Output - %s",
-                 __FILE__,
-                 (UINTN)__LINE__,
-                 ValueA ? L"Yes" : L"No",
-                 ValueB ? L"Yes" : L"No"
-                 );
-
-  //
-  // Done
-  //
-  return EFI_SUCCESS;
-}
-
-EFI_STATUS
-CheckGraphicalConsoleProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  )
-{
-  EFI_STATUS          Status;
-  UINT32              MaxLength;
-  CHAR16              String[10];
-  BOOLEAN             ValueA;
-  BOOLEAN             ValueB;
-  VOID                *Interface;
-  EFI_TEST_ASSERTION  AssertionType;
-
-  //
-  // Check the UGA_DRAW protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiUgaDrawProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueA = TRUE;
-  } else {
-    ValueA = FALSE;
-  }
-
-  //
-  // Check the UGA_IO protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiUgaIoProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueB = TRUE;
-  } else {
-    ValueB = FALSE;
-  }
-
-  //
-  // UEFI forum may want to drop UGA I/O protocol as a required implementation.
-  // So here we skip the check to this protocol.
-  //
-
-  //
-  // Need *one* or warning
-  //
-  AssertionType = NeedOneOrWarning (ValueA);
-
-  //
-  // For platform-specific elements, throw out a warning in default
-  //
-  if (AssertionType == EFI_TEST_ASSERTION_FAILED) {
-    AssertionType = EFI_TEST_ASSERTION_WARNING;
-  }
-
-  //
-  // If warning, check with INI file to decide they must exist or not
-  //
-  if ((AssertionType == EFI_TEST_ASSERTION_WARNING) &&
-      (IniFile       != NULL               )) {
-    MaxLength = 10;
-
-    Status = IniFile->GetString (
-                        IniFile,
-                        SECTION_NAME_PLATFORM_SPECIFIC,
-                        L"GraphicalConsoleDevices",
-                        String,
-                        &MaxLength
-                        );
-    if (!EFI_ERROR (Status) && (SctStriCmp (String, L"yes") == 0)) {
-      AssertionType = EFI_TEST_ASSERTION_FAILED;
-    }
-  }
-
-  //
-  // Record test result
-  //
-  StandardLib->RecordAssertion (
-                 StandardLib,
-                 AssertionType,
-                 gEfiCompliantBbTestPlatformAssertionGuid002,
-                 L"EFI Compliant - Graphical console protocols must be implemented",
-                 L"%a:%d:UGA Draw - %s, UGA IO (not required) - %s",
-                 __FILE__,
-                 (UINTN)__LINE__,
-                 ValueA ? L"Yes" : L"No",
-                 ValueB ? L"Yes" : L"No"
-                 );
-
-  //
-  // Done
-  //
-  return EFI_SUCCESS;
-}
-
-EFI_STATUS
-CheckPointerProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  )
-{
-  EFI_STATUS          Status;
-  UINT32              MaxLength;
-  CHAR16              String[10];
-  BOOLEAN             ValueA;
-  VOID                *Interface;
-  EFI_TEST_ASSERTION  AssertionType;
-
-  //
-  // Check the SIMPLE_POINTER protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiSimplePointerProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueA = TRUE;
-  } else {
-    ValueA = FALSE;
-  }
-
-  //
-  // Need one or warning
-  //
-  AssertionType = NeedOneOrWarning (ValueA);
-
-  //
-  // For platform-specific elements, throw out a warning in default
-  //
-  if (AssertionType == EFI_TEST_ASSERTION_FAILED) {
-    AssertionType = EFI_TEST_ASSERTION_WARNING;
-  }
-
-  //
-  // If warning, check with INI file to decide they must exist or not
-  //
-  if ((AssertionType == EFI_TEST_ASSERTION_WARNING) &&
-      (IniFile       != NULL               )) {
-    MaxLength = 10;
-
-    Status = IniFile->GetString (
-                        IniFile,
-                        SECTION_NAME_PLATFORM_SPECIFIC,
-                        L"PointerDevices",
-                        String,
-                        &MaxLength
-                        );
-    if (!EFI_ERROR (Status) && (SctStriCmp (String, L"yes") == 0)) {
-      AssertionType = EFI_TEST_ASSERTION_FAILED;
-    }
-  }
-
-  //
-  // Record test result
-  //
-  StandardLib->RecordAssertion (
-                 StandardLib,
-                 AssertionType,
-                 gEfiCompliantBbTestPlatformAssertionGuid003,
-                 L"EFI Compliant - Pointer protocols must be implemented",
-                 L"%a:%d:Pointer - %s",
-                 __FILE__,
-                 (UINTN)__LINE__,
-                 ValueA ? L"Yes" : L"No"
-                 );
-
-  //
-  // Done
-  //
-  return EFI_SUCCESS;
-}
-
-EFI_STATUS
-CheckBootFromDiskProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  )
-{
-  EFI_STATUS          Status;
-  UINT32              MaxLength;
-  CHAR16              String[10];
-  BOOLEAN             ValueA;
-  BOOLEAN             ValueB;
-  BOOLEAN             ValueC;
-  BOOLEAN             ValueD;
-  VOID                *Interface;
-  EFI_TEST_ASSERTION  AssertionType;
-
-  //
-  // Check the BLOCK_IO protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiBlockIoProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueA = TRUE;
-  } else {
-    ValueA = FALSE;
-  }
-
-  //
-  // Check the DISK_IO protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiDiskIoProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueB = TRUE;
-  } else {
-    ValueB = FALSE;
-  }
-
-  //
-  // Check the SIMPLE_FILE_SYSTEM protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiSimpleFileSystemProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueC = TRUE;
-  } else {
-    ValueC = FALSE;
-  }
-
-  //
-  // Check the UNICODE_COLLATION protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiUnicodeCollationProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueD = TRUE;
-  } else {
-    ValueD = FALSE;
-  }
-
-  //
-  // Need four or warning
-  //
-  AssertionType = NeedFourOrWarning (ValueA, ValueB, ValueC, ValueD);
-
-  //
-  // For platform-specific elements, throw out a warning in default
-  //
-  if (AssertionType == EFI_TEST_ASSERTION_FAILED) {
-    AssertionType = EFI_TEST_ASSERTION_WARNING;
-  }
-
-  //
-  // If warning, check with INI file to decide they must exist or not
-  //
-  if ((AssertionType == EFI_TEST_ASSERTION_WARNING) &&
-      (IniFile       != NULL               )) {
-    MaxLength = 10;
-
-    Status = IniFile->GetString (
-                        IniFile,
-                        SECTION_NAME_PLATFORM_SPECIFIC,
-                        L"BootFromDiskDevices",
-                        String,
-                        &MaxLength
-                        );
-    if (!EFI_ERROR (Status) && (SctStriCmp (String, L"yes") == 0)) {
-      AssertionType = EFI_TEST_ASSERTION_FAILED;
-    }
-  }
-
-  //
-  // Record test result
-  //
-  StandardLib->RecordAssertion (
-                 StandardLib,
-                 AssertionType,
-                 gEfiCompliantBbTestPlatformAssertionGuid004,
-                 L"EFI Compliant - Boot from disk protocols must be implemented",
-                 L"%a:%d:Block IO - %s, Disk IO - %s, Simple FS - %s, Unicode Collation - %s",
-                 __FILE__,
-                 (UINTN)__LINE__,
-                 ValueA ? L"Yes" : L"No",
-                 ValueB ? L"Yes" : L"No",
-                 ValueC ? L"Yes" : L"No",
-                 ValueD ? L"Yes" : L"No"
-                 );
-
-  //
-  // Done
-  //
-  return EFI_SUCCESS;
-}
-
-EFI_STATUS
-CheckBootFromNetworkProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  )
-{
-  EFI_STATUS          Status;
-  UINT32              MaxLength;
-  CHAR16              String[10];
-  BOOLEAN             ValueA;
-  BOOLEAN             ValueB;
-  BOOLEAN             ValueC;
-  VOID                *Interface;
-  EFI_TEST_ASSERTION  AssertionType;
-
-  //
-  // Check the SIMPLE_NETWORK protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiSimpleNetworkProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueA = TRUE;
-  } else {
-    ValueA = FALSE;
-  }
-
-  //
-  // Check the PXE_BASE_CODE protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiPxeBaseCodeProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueB = TRUE;
-  } else {
-    ValueB = FALSE;
-  }
-
-  //
-  // Check the BIS protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiBisProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueC = TRUE;
-  } else {
-    ValueC = FALSE;
-  }
-
-  //
-  // BIS protocol indicates the ability to validate a boot image received
-  // through a network device. UEFI forum may think it is not one of platform
-  // specific elements. So here we skip the check to this protocol.
-  //
-
-  //
-  // Need *two* or warning
-  //
-  AssertionType = NeedTwoOrWarning (ValueA, ValueB);
-
-  //
-  // For platform-specific elements, throw out a warning in default
-  //
-  if (AssertionType == EFI_TEST_ASSERTION_FAILED) {
-    AssertionType = EFI_TEST_ASSERTION_WARNING;
-  }
-
-  //
-  // If warning, check with INI file to decide they must exist or not
-  //
-  if ((AssertionType == EFI_TEST_ASSERTION_WARNING) &&
-      (IniFile       != NULL               )) {
-    MaxLength = 10;
-
-    Status = IniFile->GetString (
-                        IniFile,
-                        SECTION_NAME_PLATFORM_SPECIFIC,
-                        L"BootFromNetworkDevices",
-                        String,
-                        &MaxLength
-                        );
-    if (!EFI_ERROR (Status) && (SctStriCmp (String, L"yes") == 0)) {
-      AssertionType = EFI_TEST_ASSERTION_FAILED;
-    }
-  }
-
-  //
-  // Record test result
-  //
-  StandardLib->RecordAssertion (
-                 StandardLib,
-                 AssertionType,
-                 gEfiCompliantBbTestPlatformAssertionGuid005,
-                 L"EFI Compliant - Boot from network protocols must be implemented",
-                 L"%a:%d:SNP - %s, PXE BC - %s, BIS (not required) - %s",
-                 __FILE__,
-                 (UINTN)__LINE__,
-                 ValueA ? L"Yes" : L"No",
-                 ValueB ? L"Yes" : L"No",
-                 ValueC ? L"Yes" : L"No"
-                 );
-
-  //
-  // Done
-  //
-  return EFI_SUCCESS;
-}
-
-EFI_STATUS
-CheckUartProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  )
-{
-  EFI_STATUS          Status;
-  UINT32              MaxLength;
-  CHAR16              String[10];
-  BOOLEAN             ValueA;
-  VOID                *Interface;
-  EFI_TEST_ASSERTION  AssertionType;
-
-  //
-  // Check the SERIAL_IO protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiSerialIoProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueA = TRUE;
-  } else {
-    ValueA = FALSE;
-  }
-
-  //
-  // Need one or warning
-  //
-  AssertionType = NeedOneOrWarning (ValueA);
-
-  //
-  // For platform-specific elements, throw out a warning in default
-  //
-  if (AssertionType == EFI_TEST_ASSERTION_FAILED) {
-    AssertionType = EFI_TEST_ASSERTION_WARNING;
-  }
-
-  //
-  // If warning, check with INI file to decide they must exist or not
-  //
-  if ((AssertionType == EFI_TEST_ASSERTION_WARNING) &&
-      (IniFile       != NULL               )) {
-    MaxLength = 10;
-
-    Status = IniFile->GetString (
-                        IniFile,
-                        SECTION_NAME_PLATFORM_SPECIFIC,
-                        L"UartDevices",
-                        String,
-                        &MaxLength
-                        );
-    if (!EFI_ERROR (Status) && (SctStriCmp (String, L"yes") == 0)) {
-      AssertionType = EFI_TEST_ASSERTION_FAILED;
-    }
-  }
-
-  //
-  // Record test result
-  //
-  StandardLib->RecordAssertion (
-                 StandardLib,
-                 AssertionType,
-                 gEfiCompliantBbTestPlatformAssertionGuid006,
-                 L"EFI Compliant - UART protocols must be implemented",
-                 L"%a:%d:Serial IO - %s",
-                 __FILE__,
-                 (UINTN)__LINE__,
-                 ValueA ? L"Yes" : L"No"
-                 );
-
-  //
-  // Done
-  //
-  return EFI_SUCCESS;
-}
-
-EFI_STATUS
-CheckPciProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  )
-{
-  EFI_STATUS          Status;
-  UINT32              MaxLength;
-  CHAR16              String[10];
-  BOOLEAN             ValueA;
-  BOOLEAN             ValueB;
-  BOOLEAN             ValueC;
-  VOID                *Interface;
-  EFI_TEST_ASSERTION  AssertionType;
-
-  //
-  // Check the PCI_ROOT_BRIDGE_IO protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiPciRootBridgeIoProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueA = TRUE;
-  } else {
-    ValueA = FALSE;
-  }
-
-  //
-  // Check the PCI_IO protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiPciIoProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueB = TRUE;
-  } else {
-    ValueB = FALSE;
-  }
-
-  //
-  // Check the DEVICE_IO protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiDeviceIoProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueC = TRUE;
-  } else {
-    ValueC = FALSE;
-  }
-
-  //
-  // UEFI forum may want to eliminate Device IO protocol and require all drivers
-  // today to use PCI I/O protocols. So here we skip the check to this protocol.
-  //
-
-  //
-  // Need *two* or warning
-  //
-  AssertionType = NeedTwoOrWarning (ValueA, ValueB);
-
-  //
-  // For platform-specific elements, throw out a warning in default
-  //
-  if (AssertionType == EFI_TEST_ASSERTION_FAILED) {
-    AssertionType = EFI_TEST_ASSERTION_WARNING;
-  }
-
-  //
-  // If warning, check with INI file to decide they must exist or not
-  //
-  if ((AssertionType == EFI_TEST_ASSERTION_WARNING) &&
-      (IniFile       != NULL               )) {
-    MaxLength = 10;
-
-    Status = IniFile->GetString (
-                        IniFile,
-                        SECTION_NAME_PLATFORM_SPECIFIC,
-                        L"PciBusSupport",
-                        String,
-                        &MaxLength
-                        );
-    if (!EFI_ERROR (Status) && (SctStriCmp (String, L"yes") == 0)) {
-      AssertionType = EFI_TEST_ASSERTION_FAILED;
-    }
-  }
-
-  //
-  // Record test result
-  //
-  StandardLib->RecordAssertion (
-                 StandardLib,
-                 AssertionType,
-                 gEfiCompliantBbTestPlatformAssertionGuid007,
-                 L"EFI Compliant - PCI Bus support protocols must be implemented",
-                 L"%a:%d:PCI Root Bridge - %s, PCI IO - %s, Device IO (not required) - %s",
-                 __FILE__,
-                 (UINTN)__LINE__,
-                 ValueA ? L"Yes" : L"No",
-                 ValueB ? L"Yes" : L"No",
-                 ValueC ? L"Yes" : L"No"
-                 );
-
-  //
-  // Done
-  //
-  return EFI_SUCCESS;
-}
-
-EFI_STATUS
-CheckUsbProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  )
-{
-  EFI_STATUS          Status;
-  UINT32              MaxLength;
-  CHAR16              String[10];
-  BOOLEAN             ValueA;
-  BOOLEAN             ValueB;
-  VOID                *Interface;
-  EFI_TEST_ASSERTION  AssertionType;
-
-  //
-  // Check the USB_HC protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiUsbHcProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueA = TRUE;
-  } else {
-    ValueA = FALSE;
-  }
-
-  //
-  // Check the USB_IO protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiUsbIoProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueB = TRUE;
-  } else {
-    ValueB = FALSE;
-  }
-
-  //
-  // Need two or warning
-  //
-  AssertionType = NeedTwoOrWarning (ValueA, ValueB);
-
-  //
-  // For platform-specific elements, throw out a warning in default
-  //
-  if (AssertionType == EFI_TEST_ASSERTION_FAILED) {
-    AssertionType = EFI_TEST_ASSERTION_WARNING;
-  }
-
-  //
-  // If warning, check with INI file to decide they must exist or not
-  //
-  if ((AssertionType == EFI_TEST_ASSERTION_WARNING) &&
-      (IniFile       != NULL               )) {
-    MaxLength = 10;
-
-    Status = IniFile->GetString (
-                        IniFile,
-                        SECTION_NAME_PLATFORM_SPECIFIC,
-                        L"UsbBusSupport",
-                        String,
-                        &MaxLength
-                        );
-    if (!EFI_ERROR (Status) && (SctStriCmp (String, L"yes") == 0)) {
-      AssertionType = EFI_TEST_ASSERTION_FAILED;
-    }
-  }
-
-  //
-  // Record test result
-  //
-  StandardLib->RecordAssertion (
-                 StandardLib,
-                 AssertionType,
-                 gEfiCompliantBbTestPlatformAssertionGuid008,
-                 L"EFI Compliant - USB Bus support protocols must be implemented",
-                 L"%a:%d:USB HC - %s, USB IO - %s",
-                 __FILE__,
-                 (UINTN)__LINE__,
-                 ValueA ? L"Yes" : L"No",
-                 ValueB ? L"Yes" : L"No"
-                 );
-
-  //
-  // Done
-  //
-  return EFI_SUCCESS;
-}
-
-EFI_STATUS
-CheckScsiProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  )
-{
-  EFI_STATUS          Status;
-  UINT32              MaxLength;
-  CHAR16              String[10];
-  BOOLEAN             ValueA;
-  VOID                *Interface;
-  EFI_TEST_ASSERTION  AssertionType;
-
-  //
-  // Check the SCSI_PASS_THRU protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiScsiPassThruProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueA = TRUE;
-  } else {
-    ValueA = FALSE;
-  }
-
-  //
-  // Need one or warning
-  //
-  AssertionType = NeedOneOrWarning (ValueA);
-
-  //
-  // For platform-specific elements, throw out a warning in default
-  //
-  if (AssertionType == EFI_TEST_ASSERTION_FAILED) {
-    AssertionType = EFI_TEST_ASSERTION_WARNING;
-  }
-
-  //
-  // If warning, check with INI file to decide they must exist or not
-  //
-  if ((AssertionType == EFI_TEST_ASSERTION_WARNING) &&
-      (IniFile       != NULL               )) {
-    MaxLength = 10;
-
-    Status = IniFile->GetString (
-                        IniFile,
-                        SECTION_NAME_PLATFORM_SPECIFIC,
-                        L"ScsiPassThru",
-                        String,
-                        &MaxLength
-                        );
-    if (!EFI_ERROR (Status) && (SctStriCmp (String, L"yes") == 0)) {
-      AssertionType = EFI_TEST_ASSERTION_FAILED;
-    }
-  }
-
-  //
-  // Record test result
-  //
-  StandardLib->RecordAssertion (
-                 StandardLib,
-                 AssertionType,
-                 gEfiCompliantBbTestPlatformAssertionGuid009,
-                 L"EFI Compliant - SCSI Pass Thru protocol must be implemented",
-                 L"%a:%d:SCSI Pass Thru - %s",
-                 __FILE__,
-                 (UINTN)__LINE__,
-                 ValueA ? L"Yes" : L"No"
-                 );
-
-  //
-  // Done
-  //
-  return EFI_SUCCESS;
-}
-
-EFI_STATUS
-CheckDebugProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  )
-{
-  EFI_STATUS          Status;
-  UINT32              MaxLength;
-  CHAR16              String[10];
-  BOOLEAN             ValueA;
-  BOOLEAN             ValueB;
-  VOID                *Interface;
-  EFI_TEST_ASSERTION  AssertionType;
-
-  //
-  // Check the DEBUG_SUPPORT protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiDebugSupportProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueA = TRUE;
-  } else {
-    ValueA = FALSE;
-  }
-
-  //
-  // Check the DEBUG_PORT protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiDebugPortProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueB = TRUE;
-  } else {
-    ValueB = FALSE;
-  }
-
-  //
-  // Need two or warning
-  //
-  AssertionType = NeedTwoOrWarning (ValueA, ValueB);
-
-  //
-  // For platform-specific elements, throw out a warning in default
-  //
-  if (AssertionType == EFI_TEST_ASSERTION_FAILED) {
-    AssertionType = EFI_TEST_ASSERTION_WARNING;
-  }
-
-  //
-  // If warning, check with INI file to decide they must exist or not
-  //
-  if ((AssertionType == EFI_TEST_ASSERTION_WARNING) &&
-      (IniFile       != NULL               )) {
-    MaxLength = 10;
-
-    Status = IniFile->GetString (
-                        IniFile,
-                        SECTION_NAME_PLATFORM_SPECIFIC,
-                        L"DebugSupport",
-                        String,
-                        &MaxLength
-                        );
-    if (!EFI_ERROR (Status) && (SctStriCmp (String, L"yes") == 0)) {
-      AssertionType = EFI_TEST_ASSERTION_FAILED;
-    }
-  }
-
-  //
-  // Record test result
-  //
-  StandardLib->RecordAssertion (
-                 StandardLib,
-                 AssertionType,
-                 gEfiCompliantBbTestPlatformAssertionGuid010,
-                 L"EFI Compliant - Debug support protocols must be implemented",
-                 L"%a:%d:Debug Support - %s, Debug Port - %s",
-                 __FILE__,
-                 (UINTN)__LINE__,
-                 ValueA ? L"Yes" : L"No",
-                 ValueB ? L"Yes" : L"No"
-                 );
-
-  //
-  // Done
-  //
-  return EFI_SUCCESS;
-}
-
-EFI_STATUS
-CheckDriverOverrideProtocols (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib,
-  IN EFI_INI_FILE_HANDLE                  IniFile
-  )
-{
-  EFI_STATUS          Status;
-  UINT32              MaxLength;
-  CHAR16              String[10];
-  BOOLEAN             ValueA;
-  VOID                *Interface;
-  EFI_TEST_ASSERTION  AssertionType;
-
-  //
-  // Check the DRIVER_OVERRIDE protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiPlatformDriverOverrideProtocolGuid,
-                   NULL,
-                   (VOID **) &Interface
-                   );
-  if (!EFI_ERROR (Status)) {
-    ValueA = TRUE;
-  } else {
-    ValueA = FALSE;
-  }
-
-  //
-  // Need one or warning
-  //
-  AssertionType = NeedOneOrWarning (ValueA);
-
-  //
-  // For platform-specific elements, throw out a warning in default
-  //
-  if (AssertionType == EFI_TEST_ASSERTION_FAILED) {
-    AssertionType = EFI_TEST_ASSERTION_WARNING;
-  }
-
-  //
-  // If warning, check with INI file to decide they must exist or not
-  //
-  if ((AssertionType == EFI_TEST_ASSERTION_WARNING) &&
-      (IniFile       != NULL               )) {
-    MaxLength = 10;
-
-    Status = IniFile->GetString (
-                        IniFile,
-                        SECTION_NAME_PLATFORM_SPECIFIC,
-                        L"PlatformDriverOverride",
-                        String,
-                        &MaxLength
-                        );
-    if (!EFI_ERROR (Status) && (SctStriCmp (String, L"yes") == 0)) {
-      AssertionType = EFI_TEST_ASSERTION_FAILED;
-    }
-  }
-
-  //
-  // Record test result
-  //
-  StandardLib->RecordAssertion (
-                 StandardLib,
-                 AssertionType,
-                 gEfiCompliantBbTestPlatformAssertionGuid011,
-                 L"EFI Compliant - Platform Driver Override protocols must be implemented",
-                 L"%a:%d:Platform Driver Override - %s",
-                 __FILE__,
-                 (UINTN)__LINE__,
-                 ValueA ? L"Yes" : L"No"
-                 );
-
-  //
-  // Done
-  //
-  return EFI_SUCCESS;
-}
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestRequired_efi.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestRequired_efi.c
deleted file mode 100644
index 55164c7..0000000
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestRequired_efi.c
+++ /dev/null
@@ -1,820 +0,0 @@
-/** @file
-
-  Copyright 2006 - 2016 Unified EFI, Inc.<BR>
-  Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>
-
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-/*++
-
-Module Name:
-
-  EfiCompliantBbTestRequired.c
-
-Abstract:
-
-  Check the required elements in EFI Spec.
-
---*/
-
-//
-// Includes
-//
-
-#include "SctLib.h"
-#include "EfiCompliantBbTestMain_efi.h"
-#include EFI_PROTOCOL_DEFINITION (LoadedImage)
-#include EFI_PROTOCOL_DEFINITION (DevicePath)
-#include EFI_PROTOCOL_DEFINITION (Decompress)
-#include EFI_PROTOCOL_DEFINITION (Ebc)
-
-//
-// Internal functions declaration
-//
-
-EFI_STATUS
-CheckSystemTable (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib
-  );
-
-EFI_STATUS
-CheckBootServices (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib
-  );
-
-EFI_STATUS
-CheckRuntimeServices (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib
-  );
-
-EFI_STATUS
-CheckLoadedImageProtocol (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib
-  );
-
-EFI_STATUS
-CheckDevicePathProtocol (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib
-  );
-
-EFI_STATUS
-CheckDecompressProtocol (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib
-  );
-
-EFI_STATUS
-CheckEbcProtocol (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib
-  );
-
-//
-// External functions implementation
-//
-
-EFI_STATUS
-RequiredElementsBbTest (
-  IN EFI_BB_TEST_PROTOCOL         *This,
-  IN VOID                         *ClientInterface,
-  IN EFI_TEST_LEVEL               TestLevel,
-  IN EFI_HANDLE                   SupportHandle
-  )
-/*++
-
-Routine Description:
-
-  Check the required elements, which defined in the EFI spec 1.10, section
-  2.6.1.
-
---*/
-{
-  EFI_STATUS                          Status;
-  EFI_STANDARD_TEST_LIBRARY_PROTOCOL  *StandardLib;
-
-  //
-  // Locate the standard test library protocol
-  //
-  Status = gtBS->HandleProtocol (
-                   SupportHandle,
-                   &gEfiStandardTestLibraryGuid,
-                   (VOID **) &StandardLib
-                   );
-  if (EFI_ERROR (Status)) {
-    return Status;
-  }
-
-  //
-  // Check the EFI System Table
-  //
-  CheckSystemTable (StandardLib);
-
-  //
-  // Check the EFI Boot Services
-  //
-  CheckBootServices (StandardLib);
-
-  //
-  // Check the EFI Runtime Services
-  //
-  CheckRuntimeServices (StandardLib);
-
-  //
-  // Check the LOADED_IMAGE Protocol
-  //
-  CheckLoadedImageProtocol (StandardLib);
-
-  //
-  // Check the DEVICE_PATH Protocol
-  //
-  CheckDevicePathProtocol (StandardLib);
-
-  //
-  // Check the DECOMPRESS Protocol
-  //
-  CheckDecompressProtocol (StandardLib);
-
-  //
-  // Check the EBC Interpreter
-  //
-  CheckEbcProtocol (StandardLib);
-
-  //
-  // Done
-  //
-  return EFI_SUCCESS;
-}
-
-//
-// Internal functions implementation
-//
-
-EFI_STATUS
-CheckSystemTable (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib
-  )
-{
-  EFI_TEST_ASSERTION  AssertionType;
-  UINT32              CRC32;
-  UINT32              LocalCRC32;
-  EFI_STATUS          Status;
-
-  //
-  // Check the EFI System Table
-  //
-  CRC32 = gtST->Hdr.CRC32;
-  gtST->Hdr.CRC32 = 0;
-
-  LocalCRC32 = 0;
-  Status = SctCalculateCrc32 ((UINT8 *)gtST, gtST->Hdr.HeaderSize, &LocalCRC32);
-  if (EFI_ERROR (Status)) {
-    AssertionType = EFI_TEST_ASSERTION_FAILED;
-  } else {
-    if ((gtST->Hdr.Signature       == EFI_SYSTEM_TABLE_SIGNATURE      ) &&
-        (gtST->Hdr.Revision        >= 0x0001000A                      ) &&
-        (gtST->Hdr.Reserved        == 0x00000000                      ) &&
-        (gtST->RuntimeServices     != NULL                            ) &&
-        (gtST->BootServices        != NULL                            ) &&
-        (LocalCRC32                == CRC32)) {
-      AssertionType = EFI_TEST_ASSERTION_PASSED;
-    } else {
-      AssertionType = EFI_TEST_ASSERTION_FAILED;
-    }
-
-    gtST->Hdr.CRC32 = CRC32;
-  }
-
-  StandardLib->RecordAssertion (
-                 StandardLib,
-                 AssertionType,
-                 gEfiCompliantBbTestRequiredAssertionGuid001,
-                 L"EFI Compliant - EFI System Table must be implemented",
-                 L"%a:%d:Signature - %lX, Expected - %lX",
-                 __FILE__,
-                 (UINTN)__LINE__,
-                 gtST->Hdr.Signature,
-                 EFI_SYSTEM_TABLE_SIGNATURE
-                 );
-
-  //
-  // Record the entire EFI System Table
-  //
-  StandardLib->RecordMessage (
-                 StandardLib,
-                 EFI_VERBOSE_LEVEL_DEFAULT,
-                 L"  Hdr.Signature        : %lX\n"
-                 L"  Hdr.Revision         : %X\n"
-                 L"  Hdr.HeaderSize       : %X\n"
-                 L"  Hdr.CRC32            : %X\n"
-                 L"  Hdr.Reserved         : %X\n",
-                 gtST->Hdr.Signature,
-                 gtST->Hdr.Revision,
-                 gtST->Hdr.HeaderSize,
-                 gtST->Hdr.CRC32,
-                 gtST->Hdr.Reserved
-                 );
-
-  StandardLib->RecordMessage (
-                 StandardLib,
-                 EFI_VERBOSE_LEVEL_DEFAULT,
-                 L"  FirmwareVendor       : %s\n"
-                 L"  FirmwareRevision     : %X\n"
-                 L"  ConsoleInHandle      : %X\n"
-                 L"  ConIn                : %X\n"
-                 L"  ConsoleOutHandle     : %X\n"
-                 L"  ConOut               : %X\n"
-                 L"  StandardErrorHandle  : %X\n"
-                 L"  StdErr               : %X\n"
-                 L"  RuntimeServices      : %X\n"
-                 L"  BootServices         : %X\n"
-                 L"  NumberOfTableEntries : %X\n"
-                 L"  ConfigurationTable   : %X\n",
-                 gtST->FirmwareVendor,
-                 gtST->FirmwareRevision,
-                 gtST->ConsoleInHandle,
-                 gtST->ConIn,
-                 gtST->ConsoleOutHandle,
-                 gtST->ConOut,
-                 gtST->StandardErrorHandle,
-                 gtST->StdErr,
-                 gtST->RuntimeServices,
-                 gtST->BootServices,
-                 gtST->NumberOfTableEntries,
-                 gtST->ConfigurationTable
-                 );
-
-  //
-  // Done
-  //
-  return EFI_SUCCESS;
-}
-
-EFI_STATUS
-CheckBootServices (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib
-  )
-{
-  EFI_TEST_ASSERTION  AssertionType;
-  UINT32              CRC32;
-  UINT32              LocalCRC32;
-  EFI_STATUS          Status;
-
-  //
-  // Check the EFI Boot Services Table
-  //
-  CRC32 = gtBS->Hdr.CRC32;
-  gtBS->Hdr.CRC32 = 0;
-
-  LocalCRC32 = 0;
-  Status = SctCalculateCrc32 ((UINT8 *)gtBS, gtBS->Hdr.HeaderSize, &LocalCRC32);
-  if (EFI_ERROR (Status)) {
-    AssertionType = EFI_TEST_ASSERTION_FAILED;
-  } else {
-    if ((gtBS->Hdr.Signature                       == EFI_BOOT_SERVICES_SIGNATURE) &&
-        (gtBS->Hdr.Revision                        >= 0x0001000A                 ) &&
-        (gtBS->Hdr.Reserved                        == 0x00000000                 ) &&
-        (gtBS->RaiseTPL                            != NULL                       ) &&
-        (gtBS->RestoreTPL                          != NULL                       ) &&
-        (gtBS->AllocatePages                       != NULL                       ) &&
-        (gtBS->FreePages                           != NULL                       ) &&
-        (gtBS->GetMemoryMap                        != NULL                       ) &&
-        (gtBS->AllocatePool                        != NULL                       ) &&
-        (gtBS->FreePool                            != NULL                       ) &&
-        (gtBS->CreateEvent                         != NULL                       ) &&
-        (gtBS->SetTimer                            != NULL                       ) &&
-        (gtBS->WaitForEvent                        != NULL                       ) &&
-        (gtBS->SignalEvent                         != NULL                       ) &&
-        (gtBS->CloseEvent                          != NULL                       ) &&
-        (gtBS->CheckEvent                          != NULL                       ) &&
-        (gtBS->InstallProtocolInterface            != NULL                       ) &&
-        (gtBS->ReinstallProtocolInterface          != NULL                       ) &&
-        (gtBS->UninstallProtocolInterface          != NULL                       ) &&
-        (gtBS->HandleProtocol                      != NULL                       ) &&
-        (gtBS->RegisterProtocolNotify              != NULL                       ) &&
-        (gtBS->LocateHandle                        != NULL                       ) &&
-        (gtBS->LocateDevicePath                    != NULL                       ) &&
-        (gtBS->InstallConfigurationTable           != NULL                       ) &&
-        (gtBS->LoadImage                           != NULL                       ) &&
-        (gtBS->StartImage                          != NULL                       ) &&
-        (gtBS->Exit                                != NULL                       ) &&
-        (gtBS->UnloadImage                         != NULL                       ) &&
-        (gtBS->ExitBootServices                    != NULL                       ) &&
-        (gtBS->GetNextMonotonicCount               != NULL                       ) &&
-        (gtBS->Stall                               != NULL                       ) &&
-        (gtBS->SetWatchdogTimer                    != NULL                       ) &&
-        (gtBS->ConnectController                   != NULL                       ) &&
-        (gtBS->DisconnectController                != NULL                       ) &&
-        (gtBS->OpenProtocol                        != NULL                       ) &&
-        (gtBS->CloseProtocol                       != NULL                       ) &&
-        (gtBS->OpenProtocolInformation             != NULL                       ) &&
-        (gtBS->ProtocolsPerHandle                  != NULL                       ) &&
-        (gtBS->LocateHandleBuffer                  != NULL                       ) &&
-        (gtBS->LocateProtocol                      != NULL                       ) &&
-        (gtBS->InstallMultipleProtocolInterfaces   != NULL                       ) &&
-        (gtBS->UninstallMultipleProtocolInterfaces != NULL                       ) &&
-        (gtBS->CalculateCrc32                      != NULL                       ) &&
-        (gtBS->CopyMem                             != NULL                       ) &&
-        (gtBS->SetMem                              != NULL                       ) &&
-        (LocalCRC32                                == CRC32           )) {
-      AssertionType = EFI_TEST_ASSERTION_PASSED;
-    } else {
-      AssertionType = EFI_TEST_ASSERTION_FAILED;
-    }
-  }
-
-  gtBS->Hdr.CRC32 = CRC32;
-
-  StandardLib->RecordAssertion (
-                 StandardLib,
-                 AssertionType,
-                 gEfiCompliantBbTestRequiredAssertionGuid002,
-                 L"EFI Compliant - EFI Boot Services Table must be implemented",
-                 L"%a:%d:Signature - %lX, Expected - %lX",
-                 __FILE__,
-                 (UINTN)__LINE__,
-                 gtBS->Hdr.Signature,
-                 EFI_BOOT_SERVICES_SIGNATURE
-                 );
-
-  //
-  // Record the entire EFI Boot Services Table
-  //
-  StandardLib->RecordMessage (
-                 StandardLib,
-                 EFI_VERBOSE_LEVEL_DEFAULT,
-                 L"  Hdr.Signature                       : %lX\n"
-                 L"  Hdr.Revision                        : %X\n"
-                 L"  Hdr.HeaderSize                      : %X\n"
-                 L"  Hdr.CRC32                           : %X\n"
-                 L"  Hdr.Reserved                        : %X\n",
-                 gtBS->Hdr.Signature,
-                 gtBS->Hdr.Revision,
-                 gtBS->Hdr.HeaderSize,
-                 gtBS->Hdr.CRC32,
-                 gtBS->Hdr.Reserved
-                 );
-
-  StandardLib->RecordMessage (
-                 StandardLib,
-                 EFI_VERBOSE_LEVEL_DEFAULT,
-                 L"  RaiseTPL                            : %X\n"
-                 L"  RestoreTPL                          : %X\n"
-                 L"  AllocatePages                       : %X\n"
-                 L"  FreePages                           : %X\n"
-                 L"  GetMemoryMap                        : %X\n"
-                 L"  AllocatePool                        : %X\n"
-                 L"  FreePool                            : %X\n",
-                 gtBS->RaiseTPL,
-                 gtBS->RestoreTPL,
-                 gtBS->AllocatePages,
-                 gtBS->FreePages,
-                 gtBS->GetMemoryMap,
-                 gtBS->AllocatePool,
-                 gtBS->FreePool
-                 );
-
-  StandardLib->RecordMessage (
-                 StandardLib,
-                 EFI_VERBOSE_LEVEL_DEFAULT,
-                 L"  CreateEvent                         : %X\n"
-                 L"  SetTimer                            : %X\n"
-                 L"  WaitForEvent                        : %X\n"
-                 L"  SignalEvent                         : %X\n"
-                 L"  CloseEvent                          : %X\n"
-                 L"  CheckEvent                          : %X\n",
-                 gtBS->CreateEvent,
-                 gtBS->SetTimer,
-                 gtBS->WaitForEvent,
-                 gtBS->SignalEvent,
-                 gtBS->CloseEvent,
-                 gtBS->CheckEvent
-                 );
-
-  StandardLib->RecordMessage (
-                 StandardLib,
-                 EFI_VERBOSE_LEVEL_DEFAULT,
-                 L"  InstallProtocolInterface            : %X\n"
-                 L"  ReinstallProtocolInterface          : %X\n"
-                 L"  UninstallProtocolInterface          : %X\n"
-                 L"  HandleProtocol                      : %X\n"
-                 L"  Reserved                            : %X\n"
-                 L"  RegisterProtocolNotify              : %X\n"
-                 L"  LocateHandle                        : %X\n"
-                 L"  LocateDevicePath                    : %X\n",
-                 gtBS->InstallProtocolInterface,
-                 gtBS->ReinstallProtocolInterface,
-                 gtBS->UninstallProtocolInterface,
-                 gtBS->HandleProtocol,
-                 gtBS->Reserved,
-                 gtBS->RegisterProtocolNotify,
-                 gtBS->LocateHandle,
-                 gtBS->LocateDevicePath
-                 );
-
-  StandardLib->RecordMessage (
-                 StandardLib,
-                 EFI_VERBOSE_LEVEL_DEFAULT,
-                 L"  InstallConfigurationTable           : %X\n",
-                 gtBS->InstallConfigurationTable
-                 );
-
-  StandardLib->RecordMessage (
-                 StandardLib,
-                 EFI_VERBOSE_LEVEL_DEFAULT,
-                 L"  LoadImage                           : %X\n"
-                 L"  StartImage                          : %X\n"
-                 L"  Exit                                : %X\n"
-                 L"  UnloadImage                         : %X\n"
-                 L"  ExitBootServices                    : %X\n"
-                 L"  GetNextMonotonicCount               : %X\n"
-                 L"  Stall                               : %X\n"
-                 L"  SetWatchdogTimer                    : %X\n",
-                 gtBS->LoadImage,
-                 gtBS->StartImage,
-                 gtBS->Exit,
-                 gtBS->UnloadImage,
-                 gtBS->ExitBootServices,
-                 gtBS->GetNextMonotonicCount,
-                 gtBS->Stall,
-                 gtBS->SetWatchdogTimer
-                 );
-
-  StandardLib->RecordMessage (
-                 StandardLib,
-                 EFI_VERBOSE_LEVEL_DEFAULT,
-                 L"  ConnectController                   : %X\n"
-                 L"  DisconnectController                : %X\n"
-                 L"  OpenProtocol                        : %X\n"
-                 L"  CloseProtocol                       : %X\n"
-                 L"  OpenProtocolInformation             : %X\n"
-                 L"  ProtocolsPerHandle                  : %X\n"
-                 L"  LocateHandleBuffer                  : %X\n"
-                 L"  LocateProtocol                      : %X\n",
-                 gtBS->ConnectController,
-                 gtBS->DisconnectController,
-                 gtBS->OpenProtocol,
-                 gtBS->CloseProtocol,
-                 gtBS->OpenProtocolInformation,
-                 gtBS->ProtocolsPerHandle,
-                 gtBS->LocateHandleBuffer,
-                 gtBS->LocateProtocol
-                 );
-
-  StandardLib->RecordMessage (
-                 StandardLib,
-                 EFI_VERBOSE_LEVEL_DEFAULT,
-                 L"  InstallMultipleProtocolInterfaces   : %X\n"
-                 L"  UninstallMultipleProtocolInterfaces : %X\n",
-                 gtBS->InstallMultipleProtocolInterfaces,
-                 gtBS->UninstallMultipleProtocolInterfaces
-                 );
-
-  StandardLib->RecordMessage (
-                 StandardLib,
-                 EFI_VERBOSE_LEVEL_DEFAULT,
-                 L"  CalculateCrc32                      : %X\n"
-                 L"  CopyMem                             : %X\n"
-                 L"  SetMem                              : %X\n",
-                 gtBS->CalculateCrc32,
-                 gtBS->CopyMem,
-                 gtBS->SetMem
-                 );
-
-  //
-  // Done
-  //
-  return EFI_SUCCESS;
-}
-
-EFI_STATUS
-CheckRuntimeServices (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib
-  )
-{
-  EFI_TEST_ASSERTION  AssertionType;
-  UINT32              CRC32;
-  UINT32              LocalCRC32;
-  EFI_STATUS          Status;
-
-  //
-  // Check the EFI Runtime Services Table
-  //
-  CRC32 = gtRT->Hdr.CRC32;
-  gtRT->Hdr.CRC32 = 0;
-
-  LocalCRC32 = 0;
-  Status = SctCalculateCrc32 ((UINT8 *)gtRT, gtRT->Hdr.HeaderSize, &LocalCRC32);
-  if (EFI_ERROR (Status)) {
-    AssertionType = EFI_TEST_ASSERTION_FAILED;
-  } else {
-    if ((gtRT->Hdr.Signature             == EFI_RUNTIME_SERVICES_SIGNATURE) &&
-        (gtRT->Hdr.Revision              >= 0x0001000A                    ) &&
-        (gtRT->Hdr.Reserved              == 0x00000000                    ) &&
-        (gtRT->GetTime                   != NULL                          ) &&
-        (gtRT->SetTime                   != NULL                          ) &&
-        (gtRT->GetWakeupTime             != NULL                          ) &&
-        (gtRT->SetWakeupTime             != NULL                          ) &&
-        (gtRT->SetVirtualAddressMap      != NULL                          ) &&
-        (gtRT->ConvertPointer            != NULL                          ) &&
-        (gtRT->GetVariable               != NULL                          ) &&
-        (gtRT->GetNextVariableName       != NULL                          ) &&
-        (gtRT->SetVariable               != NULL                          ) &&
-        (gtRT->GetNextHighMonotonicCount != NULL                          ) &&
-        (gtRT->ResetSystem               != NULL                          ) &&
-        (LocalCRC32                      == CRC32                         )) {
-      AssertionType = EFI_TEST_ASSERTION_PASSED;
-    } else {
-      AssertionType = EFI_TEST_ASSERTION_FAILED;
-    }
-  }
-
-  gtRT->Hdr.CRC32 = CRC32;
-
-  StandardLib->RecordAssertion (
-                 StandardLib,
-                 AssertionType,
-                 gEfiCompliantBbTestRequiredAssertionGuid003,
-                 L"EFI Compliant - EFI Runtime Services Table must be implemented",
-                 L"%a:%d:Signature - %lX, Expected - %lX",
-                 __FILE__,
-                 (UINTN)__LINE__,
-                 gtRT->Hdr.Signature,
-                 EFI_RUNTIME_SERVICES_SIGNATURE
-                 );
-
-  //
-  // Record the entire EFI Runtime Services Table
-  //
-  StandardLib->RecordMessage (
-                 StandardLib,
-                 EFI_VERBOSE_LEVEL_DEFAULT,
-                 L"  Hdr.Signature             : %lX\n"
-                 L"  Hdr.Revision              : %X\n"
-                 L"  Hdr.HeaderSize            : %X\n"
-                 L"  Hdr.CRC32                 : %X\n"
-                 L"  Hdr.Reserved              : %X\n",
-                 gtRT->Hdr.Signature,
-                 gtRT->Hdr.Revision,
-                 gtRT->Hdr.HeaderSize,
-                 gtRT->Hdr.CRC32,
-                 gtRT->Hdr.Reserved
-                 );
-
-  StandardLib->RecordMessage (
-                 StandardLib,
-                 EFI_VERBOSE_LEVEL_DEFAULT,
-                 L"  GetTime                   : %X\n"
-                 L"  SetTime                   : %X\n"
-                 L"  GetWakeupTime             : %X\n"
-                 L"  SetWakeupTime             : %X\n"
-                 L"  SetVirtualAddressMap      : %X\n"
-                 L"  ConvertPointer            : %X\n"
-                 L"  GetVariable               : %X\n"
-                 L"  GetNextVariableName       : %X\n"
-                 L"  SetVariable               : %X\n",
-                 gtRT->GetTime,
-                 gtRT->SetTime,
-                 gtRT->GetWakeupTime,
-                 gtRT->SetWakeupTime,
-                 gtRT->SetVirtualAddressMap,
-                 gtRT->ConvertPointer,
-                 gtRT->GetVariable,
-                 gtRT->GetNextVariableName,
-                 gtRT->SetVariable
-                 );
-
-  StandardLib->RecordMessage (
-                 StandardLib,
-                 EFI_VERBOSE_LEVEL_DEFAULT,
-                 L"  GetNextHighMonotonicCount : %X\n"
-                 L"  ResetSystem               : %X\n",
-                 gtRT->GetNextHighMonotonicCount,
-                 gtRT->ResetSystem
-                 );
-
-  //
-  // Done
-  //
-  return EFI_SUCCESS;
-}
-
-EFI_STATUS
-CheckLoadedImageProtocol (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib
-  )
-{
-  EFI_STATUS                  Status;
-  EFI_LOADED_IMAGE_PROTOCOL   *LoadedImage;
-  EFI_TEST_ASSERTION          AssertionType;
-
-  //
-  // Check the LOADED_IMAGE protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiLoadedImageProtocolGuid,
-                   NULL,
-                   (VOID **) &LoadedImage
-                   );
-
-  if (!EFI_ERROR (Status)) {
-    AssertionType = EFI_TEST_ASSERTION_PASSED;
-  } else {
-    AssertionType = EFI_TEST_ASSERTION_FAILED;
-  }
-
-  StandardLib->RecordAssertion (
-                 StandardLib,
-                 AssertionType,
-                 gEfiCompliantBbTestRequiredAssertionGuid004,
-                 L"EFI Compliant - LOADED_IMAGE protocol must exist",
-                 L"%a:%d:Status - %r, Expected - %r",
-                 __FILE__,
-                 (UINTN)__LINE__,
-                 Status,
-                 EFI_SUCCESS
-                 );
-
-  //
-  // Done
-  //
-  return EFI_SUCCESS;
-}
-
-EFI_STATUS
-CheckDevicePathProtocol (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib
-  )
-{
-  EFI_STATUS                Status;
-  EFI_DEVICE_PATH_PROTOCOL  *DevicePath;
-  EFI_TEST_ASSERTION        AssertionType;
-
-  //
-  // Originally the test is designed to disconnect all EFI 1.10 drivers and
-  // make sure at least one device path exists. But it may change the test
-  // environment. So here we didn't disconnect all EFI 1.10 drivers.
-  //
-
-  //
-  // Check the DEVICE_PATH protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiDevicePathProtocolGuid,
-                   NULL,
-                   (VOID **) &DevicePath
-                   );
-
-  if (!EFI_ERROR (Status)) {
-    AssertionType = EFI_TEST_ASSERTION_PASSED;
-  } else {
-    AssertionType = EFI_TEST_ASSERTION_FAILED;
-  }
-
-  StandardLib->RecordAssertion (
-                 StandardLib,
-                 AssertionType,
-                 gEfiCompliantBbTestRequiredAssertionGuid005,
-                 L"EFI Compliant - DEVICE_PATH protocol must exist",
-                 L"%a:%d:Status - %r, Expected - %r",
-                 __FILE__,
-                 (UINTN)__LINE__,
-                 Status,
-                 EFI_SUCCESS
-                 );
-
-  //
-  // Done
-  //
-  return EFI_SUCCESS;
-}
-
-EFI_STATUS
-CheckDecompressProtocol (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib
-  )
-{
-  EFI_STATUS                Status;
-  EFI_DECOMPRESS_PROTOCOL   *Decompress;
-  EFI_TEST_ASSERTION        AssertionType;
-
-  //
-  // Check the DECOMPRESS protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiDecompressProtocolGuid,
-                   NULL,
-                   (VOID **) &Decompress
-                   );
-
-  if ((Status                 == EFI_SUCCESS) &&
-      (Decompress->GetInfo    != NULL       ) &&
-      (Decompress->Decompress != NULL       )) {
-    AssertionType = EFI_TEST_ASSERTION_PASSED;
-  } else {
-    AssertionType = EFI_TEST_ASSERTION_FAILED;
-  }
-
-  StandardLib->RecordAssertion (
-                 StandardLib,
-                 AssertionType,
-                 gEfiCompliantBbTestRequiredAssertionGuid006,
-                 L"EFI Compliant - DECOMPRESS protocol must exist",
-                 L"%a:%d:Status - %r, Expected - %r",
-                 __FILE__,
-                 (UINTN)__LINE__,
-                 Status,
-                 EFI_SUCCESS
-                 );
-
-  //
-  // Record the entire DECOMPRESS protocol
-  //
-  if (!EFI_ERROR (Status)) {
-    StandardLib->RecordMessage (
-                   StandardLib,
-                   EFI_VERBOSE_LEVEL_DEFAULT,
-                   L"  GetInfo    : %X\n"
-                   L"  Decompress : %X\n",
-                   Decompress->GetInfo,
-                   Decompress->Decompress
-                   );
-  }
-
-  //
-  // Done
-  //
-  return EFI_SUCCESS;
-}
-
-EFI_STATUS
-CheckEbcProtocol (
-  IN EFI_STANDARD_TEST_LIBRARY_PROTOCOL   *StandardLib
-  )
-{
-  EFI_STATUS          Status;
-  EFI_EBC_PROTOCOL    *Ebc;
-  EFI_TEST_ASSERTION  AssertionType;
-
-  //
-  // Check the EBC Interpreter protocol
-  //
-  Status = gtBS->LocateProtocol (
-                   &gEfiEbcProtocolGuid,
-                   NULL,
-                   (VOID **) &Ebc
-                   );
-
-  if ((Status                   == EFI_SUCCESS) &&
-      (Ebc->CreateThunk         != NULL       ) &&
-      (Ebc->UnloadImage         != NULL       ) &&
-      (Ebc->RegisterICacheFlush != NULL       ) &&
-      (Ebc->GetVersion          != NULL       ))  {
-    AssertionType = EFI_TEST_ASSERTION_PASSED;
-  } else {
-    AssertionType = EFI_TEST_ASSERTION_FAILED;
-  }
-
-  StandardLib->RecordAssertion (
-                 StandardLib,
-                 AssertionType,
-                 gEfiCompliantBbTestRequiredAssertionGuid007,
-                 L"EFI Compliant - EBC Interpreter protocol must exist",
-                 L"%a:%d:Status - %r, Expected - %r",
-                 __FILE__,
-                 (UINTN)__LINE__,
-                 Status,
-                 EFI_SUCCESS
-                 );
-
-  //
-  // Record the entire EBC Interpreter protocol
-  //
-  if (!EFI_ERROR (Status)) {
-    StandardLib->RecordMessage (
-                   StandardLib,
-                   EFI_VERBOSE_LEVEL_DEFAULT,
-                   L"  CreateThunk         : %X\n"
-                   L"  UnloadImage         : %X\n"
-                   L"  RegisterICacheFlush : %X\n"
-                   L"  GetVersion          : %X\n",
-                   Ebc->CreateThunk,
-                   Ebc->UnloadImage,
-                   Ebc->RegisterICacheFlush,
-                   Ebc->GetVersion
-                   );
-  }
-
-  //
-  // EBC Image Execution test will be included in the Protocol's Black-Box Test
-  //
-
-  //
-  // Done
-  //
-  return EFI_SUCCESS;
-}
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestSupport_efi.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestSupport_efi.c
deleted file mode 100644
index 9c922dc..0000000
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTestSupport_efi.c
+++ /dev/null
@@ -1,390 +0,0 @@
-/** @file
-
-  Copyright 2006 - 2010 Unified EFI, Inc.<BR>
-  Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
-
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-/*++
-
-Module Name:
-
-  EfiCompliantBbTestSupport.c
-
-Abstract:
-
-  Support services for EFI Compliant Black-Box Test.
-
---*/
-
-#include "SctLib.h"
-#include "EfiCompliantBbTestMain_efi.h"
-
-//
-// Module variables
-//
-
-UINT32  mCrcTable[256] = {
-  0x00000000,
-  0x77073096,
-  0xEE0E612C,
-  0x990951BA,
-  0x076DC419,
-  0x706AF48F,
-  0xE963A535,
-  0x9E6495A3,
-  0x0EDB8832,
-  0x79DCB8A4,
-  0xE0D5E91E,
-  0x97D2D988,
-  0x09B64C2B,
-  0x7EB17CBD,
-  0xE7B82D07,
-  0x90BF1D91,
-  0x1DB71064,
-  0x6AB020F2,
-  0xF3B97148,
-  0x84BE41DE,
-  0x1ADAD47D,
-  0x6DDDE4EB,
-  0xF4D4B551,
-  0x83D385C7,
-  0x136C9856,
-  0x646BA8C0,
-  0xFD62F97A,
-  0x8A65C9EC,
-  0x14015C4F,
-  0x63066CD9,
-  0xFA0F3D63,
-  0x8D080DF5,
-  0x3B6E20C8,
-  0x4C69105E,
-  0xD56041E4,
-  0xA2677172,
-  0x3C03E4D1,
-  0x4B04D447,
-  0xD20D85FD,
-  0xA50AB56B,
-  0x35B5A8FA,
-  0x42B2986C,
-  0xDBBBC9D6,
-  0xACBCF940,
-  0x32D86CE3,
-  0x45DF5C75,
-  0xDCD60DCF,
-  0xABD13D59,
-  0x26D930AC,
-  0x51DE003A,
-  0xC8D75180,
-  0xBFD06116,
-  0x21B4F4B5,
-  0x56B3C423,
-  0xCFBA9599,
-  0xB8BDA50F,
-  0x2802B89E,
-  0x5F058808,
-  0xC60CD9B2,
-  0xB10BE924,
-  0x2F6F7C87,
-  0x58684C11,
-  0xC1611DAB,
-  0xB6662D3D,
-  0x76DC4190,
-  0x01DB7106,
-  0x98D220BC,
-  0xEFD5102A,
-  0x71B18589,
-  0x06B6B51F,
-  0x9FBFE4A5,
-  0xE8B8D433,
-  0x7807C9A2,
-  0x0F00F934,
-  0x9609A88E,
-  0xE10E9818,
-  0x7F6A0DBB,
-  0x086D3D2D,
-  0x91646C97,
-  0xE6635C01,
-  0x6B6B51F4,
-  0x1C6C6162,
-  0x856530D8,
-  0xF262004E,
-  0x6C0695ED,
-  0x1B01A57B,
-  0x8208F4C1,
-  0xF50FC457,
-  0x65B0D9C6,
-  0x12B7E950,
-  0x8BBEB8EA,
-  0xFCB9887C,
-  0x62DD1DDF,
-  0x15DA2D49,
-  0x8CD37CF3,
-  0xFBD44C65,
-  0x4DB26158,
-  0x3AB551CE,
-  0xA3BC0074,
-  0xD4BB30E2,
-  0x4ADFA541,
-  0x3DD895D7,
-  0xA4D1C46D,
-  0xD3D6F4FB,
-  0x4369E96A,
-  0x346ED9FC,
-  0xAD678846,
-  0xDA60B8D0,
-  0x44042D73,
-  0x33031DE5,
-  0xAA0A4C5F,
-  0xDD0D7CC9,
-  0x5005713C,
-  0x270241AA,
-  0xBE0B1010,
-  0xC90C2086,
-  0x5768B525,
-  0x206F85B3,
-  0xB966D409,
-  0xCE61E49F,
-  0x5EDEF90E,
-  0x29D9C998,
-  0xB0D09822,
-  0xC7D7A8B4,
-  0x59B33D17,
-  0x2EB40D81,
-  0xB7BD5C3B,
-  0xC0BA6CAD,
-  0xEDB88320,
-  0x9ABFB3B6,
-  0x03B6E20C,
-  0x74B1D29A,
-  0xEAD54739,
-  0x9DD277AF,
-  0x04DB2615,
-  0x73DC1683,
-  0xE3630B12,
-  0x94643B84,
-  0x0D6D6A3E,
-  0x7A6A5AA8,
-  0xE40ECF0B,
-  0x9309FF9D,
-  0x0A00AE27,
-  0x7D079EB1,
-  0xF00F9344,
-  0x8708A3D2,
-  0x1E01F268,
-  0x6906C2FE,
-  0xF762575D,
-  0x806567CB,
-  0x196C3671,
-  0x6E6B06E7,
-  0xFED41B76,
-  0x89D32BE0,
-  0x10DA7A5A,
-  0x67DD4ACC,
-  0xF9B9DF6F,
-  0x8EBEEFF9,
-  0x17B7BE43,
-  0x60B08ED5,
-  0xD6D6A3E8,
-  0xA1D1937E,
-  0x38D8C2C4,
-  0x4FDFF252,
-  0xD1BB67F1,
-  0xA6BC5767,
-  0x3FB506DD,
-  0x48B2364B,
-  0xD80D2BDA,
-  0xAF0A1B4C,
-  0x36034AF6,
-  0x41047A60,
-  0xDF60EFC3,
-  0xA867DF55,
-  0x316E8EEF,
-  0x4669BE79,
-  0xCB61B38C,
-  0xBC66831A,
-  0x256FD2A0,
-  0x5268E236,
-  0xCC0C7795,
-  0xBB0B4703,
-  0x220216B9,
-  0x5505262F,
-  0xC5BA3BBE,
-  0xB2BD0B28,
-  0x2BB45A92,
-  0x5CB36A04,
-  0xC2D7FFA7,
-  0xB5D0CF31,
-  0x2CD99E8B,
-  0x5BDEAE1D,
-  0x9B64C2B0,
-  0xEC63F226,
-  0x756AA39C,
-  0x026D930A,
-  0x9C0906A9,
-  0xEB0E363F,
-  0x72076785,
-  0x05005713,
-  0x95BF4A82,
-  0xE2B87A14,
-  0x7BB12BAE,
-  0x0CB61B38,
-  0x92D28E9B,
-  0xE5D5BE0D,
-  0x7CDCEFB7,
-  0x0BDBDF21,
-  0x86D3D2D4,
-  0xF1D4E242,
-  0x68DDB3F8,
-  0x1FDA836E,
-  0x81BE16CD,
-  0xF6B9265B,
-  0x6FB077E1,
-  0x18B74777,
-  0x88085AE6,
-  0xFF0F6A70,
-  0x66063BCA,
-  0x11010B5C,
-  0x8F659EFF,
-  0xF862AE69,
-  0x616BFFD3,
-  0x166CCF45,
-  0xA00AE278,
-  0xD70DD2EE,
-  0x4E048354,
-  0x3903B3C2,
-  0xA7672661,
-  0xD06016F7,
-  0x4969474D,
-  0x3E6E77DB,
-  0xAED16A4A,
-  0xD9D65ADC,
-  0x40DF0B66,
-  0x37D83BF0,
-  0xA9BCAE53,
-  0xDEBB9EC5,
-  0x47B2CF7F,
-  0x30B5FFE9,
-  0xBDBDF21C,
-  0xCABAC28A,
-  0x53B39330,
-  0x24B4A3A6,
-  0xBAD03605,
-  0xCDD70693,
-  0x54DE5729,
-  0x23D967BF,
-  0xB3667A2E,
-  0xC4614AB8,
-  0x5D681B02,
-  0x2A6F2B94,
-  0xB40BBE37,
-  0xC30C8EA1,
-  0x5A05DF1B,
-  0x2D02EF8D
-};
-
-//
-// External functions implementation
-//
-
-EFI_STATUS
-OpenIniFile (
-  IN  EFI_TEST_PROFILE_LIBRARY_PROTOCOL   *ProfileLib,
-  IN  CHAR16                              *IniPathName,
-  IN  CHAR16                              *IniFileName,
-  OUT EFI_INI_FILE_HANDLE                 *IniFile
-  )
-{
-  EFI_STATUS                Status;
-  EFI_DEVICE_PATH_PROTOCOL  *DevicePath;
-  CHAR16                    *FilePath;
-  CHAR16                    *IniFilePath;
-
-  //
-  // Get the system device path
-  //
-  Status = ProfileLib->EfiGetSystemDevicePath (
-                         ProfileLib,
-                         &DevicePath,
-                         &FilePath
-                         );
-  if (EFI_ERROR (Status)) {
-    return Status;
-  }
-
-  //
-  // Generate the INI file path
-  //
-  IniFilePath = SctPoolPrint (
-                  L"%s\\%s\\%s",
-                  FilePath,
-                  IniPathName,
-                  IniFileName
-                  );
-  if (IniFilePath == NULL) {
-    gtBS->FreePool (DevicePath);
-    gtBS->FreePool (FilePath);
-    return EFI_OUT_OF_RESOURCES;
-  }
-
-  //
-  // Open the INI file
-  //
-  Status = ProfileLib->EfiIniOpen (
-                         ProfileLib,
-                         DevicePath,
-                         IniFilePath,
-                         IniFile
-                         );
-  if (EFI_ERROR (Status)) {
-    *IniFile = NULL;
-  }
-
-  //
-  // Free resources
-  //
-  gtBS->FreePool (DevicePath);
-  gtBS->FreePool (FilePath);
-  gtBS->FreePool (IniFilePath);
-
-  //
-  // Done
-  //
-  return EFI_SUCCESS;
-}
-
-EFI_STATUS
-CloseIniFile (
-  IN  EFI_TEST_PROFILE_LIBRARY_PROTOCOL   *ProfileLib,
-  IN  EFI_INI_FILE_HANDLE                 IniFile
-  )
-{
-  EFI_STATUS  Status;
-
-  //
-  // Check parameters
-  //
-  if (IniFile == NULL) {
-    return EFI_SUCCESS;
-  }
-
-  //
-  // Close the INI file
-  //
-  Status = ProfileLib->EfiIniClose (
-                         ProfileLib,
-                         IniFile
-                         );
-
-  //
-  // Done
-  //
-  return Status;
-}
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTest_efi.inf b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTest_efi.inf
deleted file mode 100644
index 6d99dc1..0000000
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/EfiCompliantBBTest_efi.inf
+++ /dev/null
@@ -1,56 +0,0 @@
-## @file
-#
-#  Copyright 2006 - 2012 Unified EFI, Inc.<BR>
-#  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.<BR>
-#
-#  This program and the accompanying materials
-#  are licensed and made available under the terms and conditions of the BSD License
-#  which accompanies this distribution.  The full text of the license may be found at
-#  http://opensource.org/licenses/bsd-license.php
-#
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
-##
-#/*++
-#
-# Module Name:
-#
-#   EfiCompliantBbTest_efi.inf
-#
-# Abstract:
-#
-#   Component description file for EFI Compliant Black-Box Test.
-#
-#--*/
-
-[Defines]
-  INF_VERSION          = 0x00010005
-  BASE_NAME            = EfiCompliantBbTest
-  FILE_GUID            = B45574E7-3848-4917-853F-931AC4FC0225
-  MODULE_TYPE          = UEFI_DRIVER
-  VERSION_STRING       = 1.0
-  ENTRY_POINT          = InitializeEfiCompliantBbTest
-
-[Sources.common]
-  EfiCompliantBBTestMain_efi.c
-  EfiCompliantBBTestMain_efi.h
-  EfiCompliantBBTestRequired_efi.c
-  EfiCompliantBBTestPlatform_efi.c
-  EfiCompliantBBTestDriver_efi.c
-  EfiCompliantBBTestSupport_efi.c
-  Guid_efi.c
-  Guid_efi.h
-
-[Packages]
-  MdePkg/MdePkg.dec
-  SctPkg/SctPkg.dec
-  SctPkg/UEFI/UEFI.dec
-
-[LibraryClasses]
-  UefiDriverEntryPoint
-  SctLib
-  EfiTestLib
-
-[Protocols]
-  gEfiDebugPortProtocolGuid
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/Guid_efi.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/Guid_efi.c
deleted file mode 100644
index d2963cc..0000000
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/Guid_efi.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/** @file
-
-  Copyright 2006 - 2012 Unified EFI, Inc.<BR>
-  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.<BR>
-
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-/*++
-
-Module Name:
-
-  guid.c
-
-Abstract:
-
-  GUIDs for EFI test assertion.
-
---*/
-
-#include "Efi.h"
-#include "Guid_efi.h"
-
-
-EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid001 = EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_001_GUID;
-
-EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid002 = EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_002_GUID;
-
-EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid003 = EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_003_GUID;
-
-EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid004 = EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_004_GUID;
-
-EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid005 = EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_005_GUID;
-
-EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid006 = EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_006_GUID;
-
-EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid007 = EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_007_GUID;
-
-EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid008 = EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_008_GUID;
-
-EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid009 = EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_009_GUID;
-
-EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid010 = EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_010_GUID;
-
-EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid011 = EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_011_GUID;
-
-EFI_GUID gEfiCompliantBbTestRequiredAssertionGuid001 = EFI_TEST_EFICOMPLIANTBBTESTREQUIRED_ASSERTION_001_GUID;
-
-EFI_GUID gEfiCompliantBbTestRequiredAssertionGuid002 = EFI_TEST_EFICOMPLIANTBBTESTREQUIRED_ASSERTION_002_GUID;
-
-EFI_GUID gEfiCompliantBbTestRequiredAssertionGuid003 = EFI_TEST_EFICOMPLIANTBBTESTREQUIRED_ASSERTION_003_GUID;
-
-EFI_GUID gEfiCompliantBbTestRequiredAssertionGuid004 = EFI_TEST_EFICOMPLIANTBBTESTREQUIRED_ASSERTION_004_GUID;
-
-EFI_GUID gEfiCompliantBbTestRequiredAssertionGuid005 = EFI_TEST_EFICOMPLIANTBBTESTREQUIRED_ASSERTION_005_GUID;
-
-EFI_GUID gEfiCompliantBbTestRequiredAssertionGuid006 = EFI_TEST_EFICOMPLIANTBBTESTREQUIRED_ASSERTION_006_GUID;
-
-EFI_GUID gEfiCompliantBbTestRequiredAssertionGuid007 = EFI_TEST_EFICOMPLIANTBBTESTREQUIRED_ASSERTION_007_GUID;
diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/Guid_efi.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/Guid_efi.h
deleted file mode 100644
index ea1c52f..0000000
--- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/EfiCompliant/BlackBoxTest/Guid_efi.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/** @file
-
-  Copyright 2006 - 2016 Unified EFI, Inc.<BR>
-  Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>
-
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-/*++
-
-Module Name:
-
-  guid.h
-
-Abstract:
-
-  GUIDs auto-generated for EFI test assertion.
-
---*/
-
-
-#define EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_001_GUID \
-{ 0x8f7556c2, 0x4665, 0x4353, {0xa3, 0xaf, 0x9c, 0x00, 0x5a, 0x1e, 0x63, 0xe1 }}
-
-extern EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid001;
-
-#define EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_002_GUID \
-{ 0x72ba0e86, 0x58e5, 0x48dd, {0x85, 0x29, 0x88, 0xc6, 0x83, 0x83, 0x11, 0x8d }}
-
-extern EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid002;
-
-#define EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_003_GUID \
-{ 0x18670db1, 0x89fb, 0x4de4, {0xb1, 0x0f, 0x89, 0x8e, 0x04, 0x7d, 0x95, 0x2a }}
-
-extern EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid003;
-
-#define EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_004_GUID \
-{ 0xbf38a3fd, 0x58ac, 0x419a, {0xab, 0xc2, 0xc6, 0x0b, 0xae, 0x9c, 0xfe, 0x67 }}
-
-extern EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid004;
-
-#define EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_005_GUID \
-{ 0x98551ae7, 0x5020, 0x4ddd, {0x86, 0x1a, 0xcf, 0xff, 0xb4, 0xd6, 0x03, 0x82 }}
-
-extern EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid005;
-
-#define EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_006_GUID \
-{ 0x517bcbeb, 0x4982, 0x4a7e, {0x85, 0x51, 0xca, 0x84, 0x7d, 0xdc, 0x21, 0xc2 }}
-
-extern EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid006;
-
-#define EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_007_GUID \
-{ 0x213a75c9, 0x7f3d, 0x42db, {0xb3, 0x2a, 0x02, 0xdb, 0xd6, 0x98, 0x31, 0x9d }}
-
-extern EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid007;
-
-#define EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_008_GUID \
-{ 0x0ccd5843, 0x5bb5, 0x4fc2, {0xa7, 0x32, 0xdb, 0x17, 0xc4, 0x14, 0xa4, 0x3d }}
-
-extern EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid008;
-
-#define EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_009_GUID \
-{ 0x2b83418f, 0xe7fb, 0x4528, {0xb6, 0xff, 0xc9, 0xd4, 0x87, 0xae, 0x2e, 0xff }}
-
-extern EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid009;
-
-#define EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_010_GUID \
-{ 0x3ee22696, 0x0875, 0x46f4, {0x88, 0x84, 0xba, 0x12, 0x4c, 0x7e, 0xaf, 0xf0 }}
-
-extern EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid010;
-
-#define EFI_TEST_EFICOMPLIANTBBTESTPLATFORM_ASSERTION_011_GUID \
-{ 0x329027ce, 0x406e, 0x48c8, {0x8a, 0xc1, 0xa0, 0x2c, 0x1a, 0x6e, 0x39, 0x83 }}
-
-extern EFI_GUID gEfiCompliantBbTestPlatformAssertionGuid011;
-
-#define EFI_TEST_EFICOMPLIANTBBTESTREQUIRED_ASSERTION_001_GUID \
-{ 0xf6a871e3, 0xef8a, 0x420f, {0x82, 0x01, 0x35, 0xb6, 0x1c, 0xe2, 0xe8, 0xdb }}
-
-extern EFI_GUID gEfiCompliantBbTestRequiredAssertionGuid001;
-
-#define EFI_TEST_EFICOMPLIANTBBTESTREQUIRED_ASSERTION_002_GUID \
-{ 0xaddab6ed, 0x5a17, 0x4327, {0x8f, 0xb1, 0x72, 0x93, 0x3d, 0x1a, 0x7b, 0xba }}
-
-extern EFI_GUID gEfiCompliantBbTestRequiredAssertionGuid002;
-
-#define EFI_TEST_EFICOMPLIANTBBTESTREQUIRED_ASSERTION_003_GUID \
-{ 0x13a20958, 0xc860, 0x452f, {0xb9, 0xa2, 0xe6, 0xd9, 0x96, 0x41, 0x92, 0x24 }}
-
-extern EFI_GUID gEfiCompliantBbTestRequiredAssertionGuid003;
-
-#define EFI_TEST_EFICOMPLIANTBBTESTREQUIRED_ASSERTION_004_GUID \
-{ 0xa82f8d56, 0x1476, 0x41f1, {0xba, 0xc4, 0x97, 0x59, 0x79, 0x9f, 0x97, 0xf3 }}
-
-extern EFI_GUID gEfiCompliantBbTestRequiredAssertionGuid004;
-
-#define EFI_TEST_EFICOMPLIANTBBTESTREQUIRED_ASSERTION_005_GUID \
-{ 0xf61f0f0a, 0x64fe, 0x40a6, {0x9d, 0x7c, 0x07, 0x46, 0xa2, 0x30, 0x24, 0x5f }}
-
-extern EFI_GUID gEfiCompliantBbTestRequiredAssertionGuid005;
-
-#define EFI_TEST_EFICOMPLIANTBBTESTREQUIRED_ASSERTION_006_GUID \
-{ 0x02c017d7, 0x1557, 0x47d9, {0xbc, 0xe9, 0x87, 0x18, 0x2d, 0x07, 0x91, 0x0c }}
-
-extern EFI_GUID gEfiCompliantBbTestRequiredAssertionGuid006;
-
-#define EFI_TEST_EFICOMPLIANTBBTESTREQUIRED_ASSERTION_007_GUID \
-{ 0x2283aa73, 0xa851, 0x4009, {0x87, 0xc0, 0x4a, 0x46, 0x2f, 0xae, 0x36, 0xc3 }}
-
-extern EFI_GUID gEfiCompliantBbTestRequiredAssertionGuid007;
--
2.9.0.windows.1

IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-11-21 14:47 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-21  2:13 [edk2-test][Patch] uefi-sct/SctPkg:Remove old unused files in EfiCompliant test Eric Jin
2018-11-21 14:47 ` Supreeth Venkatesh

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox