[edk2] [staging/edk2-test PATCH V2 0/6] Fix XCODE and GCC build issues

Michael Kinney posted 6 patches 7 years, 1 month ago
Failed in applying to current master (apply log)
Readme.md                                          |  52 +-
TestCasePkg/Timer/ArchTimerBBTestConformance.c     |   7 +-
TestCasePkg/Timer/ArchTimerBBTestFunction.c        |  12 +-
TestCasePkg/Timer/ArchTimerBBTestMain.c            |   4 +-
TestCasePkg/Timer/Guid.h                           |  41 +-
TestFrameworkPkg/Eftp/ComponentName.c              |   4 +
TestFrameworkPkg/Eftp/EftpCommon.h                 |   2 +-
TestFrameworkPkg/Eftp/EftpDriver.h                 |   5 +
TestFrameworkPkg/Eftp/EftpMain.c                   |   6 +-
TestFrameworkPkg/Eftp/EftpMain.h                   |   8 +-
TestFrameworkPkg/Eftp/EftpOption.c                 |  36 +-
TestFrameworkPkg/Eftp/EftpOption.h                 |   4 +-
TestFrameworkPkg/Eftp/EftpPacket.c                 |   8 +-
TestFrameworkPkg/Eftp/EftpPacket.h                 |   4 +-
TestFrameworkPkg/Eftp/EftpRRQ.c                    |  41 +-
TestFrameworkPkg/Eftp/EftpRRQ.h                    |   8 +-
TestFrameworkPkg/Eftp/EftpWRQ.c                    |  24 +-
TestFrameworkPkg/Eftp/EftpWRQ.h                    |   2 +
TestFrameworkPkg/Include/Library/EntsLib.h         | 225 -------
TestFrameworkPkg/Include/Protocol/BbTest.h         |   8 +-
TestFrameworkPkg/Include/Protocol/Eftp.h           |  24 +-
.../Include/Protocol/EntsMonitorProtocol.h         |   4 +-
TestFrameworkPkg/Include/Protocol/LibPrivate.h     |  12 +-
.../Include/Protocol/StandardTestLibrary.h         |   4 +-
.../Include/Protocol/TestLoggingLibrary.h          |   4 +-
.../Include/Protocol/TestOutputLibrary.h           |   4 +-
.../Include/Protocol/TestProfileLibrary.h          |   9 +-
.../Include/Protocol/TestRecoveryLibrary.h         |   4 +-
TestFrameworkPkg/Include/Protocol/TslInit.h        |   4 +-
TestFrameworkPkg/Include/Protocol/WBTest.h         |  84 ---
TestFrameworkPkg/Include/Protocol/WbTest.h         |  84 +++
TestFrameworkPkg/InstallSct/InstallSct.c           |  25 +-
TestFrameworkPkg/Library/EasLib/EntsContext.c      |  85 +--
TestFrameworkPkg/Library/EasLib/EntsDpath.c        |  62 +-
TestFrameworkPkg/Library/EasLib/EntsGuid.c         | 113 ++--
TestFrameworkPkg/Library/EasLib/EntsLib.c          |  21 +-
TestFrameworkPkg/Library/EasLib/EntsLib.inf        |  21 +-
TestFrameworkPkg/Library/EasLib/EntsMisc.c         |   4 +-
TestFrameworkPkg/Library/EasLib/EntsPrint.c        |   6 +-
TestFrameworkPkg/Library/EasLib/EntsStr.c          | 690 ---------------------
TestFrameworkPkg/Library/EasLib/EntsSupport.c      |  50 +-
TestFrameworkPkg/Library/EasLib/EntsTime.c         |   2 +-
TestFrameworkPkg/Library/EfiTestLib/EfiTestLib.c   |  22 +-
.../IP4NetworkMonitor/IP4NetworkMonitor.c          |  38 +-
.../IP4NetworkMonitor/IP4NetworkMonitor.h          |   8 +-
.../ManagedNetworkMonitor/ManagedNetworkMonitor.c  |  33 +-
.../ManagedNetworkMonitor/ManagedNetworkMonitor.h  |   6 +
.../MonitorServices/SerialMonitor/SerialMonitor.c  |   8 +-
.../PeiSctManageModule/PeiSctManageModule.c        |  19 +-
TestFrameworkPkg/Sct/Core/SctInit.c                |   4 +-
TestFrameworkPkg/Sct/Data/ApTest.c                 |   4 +-
TestFrameworkPkg/Sct/Data/Category.c               |   2 +-
TestFrameworkPkg/Sct/Data/TestCase.c               |   2 +-
TestFrameworkPkg/Sct/Data/TestCaseEx.c             |   2 -
TestFrameworkPkg/Sct/Data/TestNode.c               |   4 +-
TestFrameworkPkg/Sct/DeviceConfig/DeviceConfig.c   |  12 +-
.../Sct/ENTS/EasDispatcher/Arg/EasArg.c            |   2 +-
TestFrameworkPkg/Sct/ENTS/EasDispatcher/Core/Eas.c |   3 -
.../Sct/ENTS/EasDispatcher/Core/EasInit.c          |   6 +-
.../Sct/ENTS/EasDispatcher/Exec/EasCmdDisp.c       |   9 +-
.../Sct/ENTS/EasDispatcher/Exec/EftpImplement.c    |  17 +-
.../Sct/ENTS/EasDispatcher/Load/EasSupportFile.c   |  12 +-
.../Sct/ENTS/EasDispatcher/Load/EasTestFile.c      |  10 +-
.../Sct/ENTS/EasDispatcher/Rivl/RivlType.c         |   8 +-
.../Sct/ENTS/EasDispatcher/Rivl/RivlVariable.c     |  25 +-
TestFrameworkPkg/Sct/Execute/Execute.c             |   5 -
TestFrameworkPkg/Sct/Execute/ExecuteSupport.c      |  22 +-
TestFrameworkPkg/Sct/Execute/ExecuteSupport.h      |   1 +
TestFrameworkPkg/Sct/Execute/Reset.c               |   6 +-
TestFrameworkPkg/Sct/Include/ApTest.h              |   4 +-
TestFrameworkPkg/Sct/Include/SctCore.h             |   1 +
TestFrameworkPkg/Sct/Include/SctDef.h              |   2 +-
TestFrameworkPkg/Sct/Include/SctOutput.h           |   4 +-
TestFrameworkPkg/Sct/Load/SupportFile.c            |  32 +-
TestFrameworkPkg/Sct/Load/TestFile.c               |  14 +-
TestFrameworkPkg/Sct/Misc/SctMisc.c                |   6 +-
TestFrameworkPkg/Sct/Operation/Operation.c         |   2 +-
TestFrameworkPkg/Sct/Report/Report.c               |  14 +-
TestFrameworkPkg/Sct/Report/ReportConfig.c         |   2 +-
TestFrameworkPkg/Sct/Report/ReportDatabase.c       |  14 +-
TestFrameworkPkg/Sct/Report/ReportSupport.c        |  10 +-
TestFrameworkPkg/Sct/Report/ReportSupport.h        |   8 +-
TestFrameworkPkg/Sct/UI/BuildMenu.c                |   8 +-
TestFrameworkPkg/Sct/UI/BuildMenu.h                |  11 +-
TestFrameworkPkg/Sct/UI/ConfigMenu.c               |  51 +-
TestFrameworkPkg/Sct/UI/Dialog.h                   |   2 +-
TestFrameworkPkg/Sct/UI/DisplayUi.c                |  14 +-
TestFrameworkPkg/Sct/UI/FileDialog.c               |   4 +-
TestFrameworkPkg/Sct/UI/FileDialog.h               |   2 +-
TestFrameworkPkg/Sct/UI/KeyFunction.c              |  48 +-
TestFrameworkPkg/Sct/UI/LogFileDialog.c            |   6 +-
TestFrameworkPkg/Sct/UI/LogFileDialog.h            |   2 +-
TestFrameworkPkg/Sct/UI/MainMenu.c                 |  18 +
TestFrameworkPkg/Sct/UI/TestNodeMenu.c             |  18 +-
TestFrameworkPkg/Sct/UI/TestNodeMenu.h             |   2 +-
TestFrameworkPkg/Sct/UI/UI.h                       |  32 +-
TestFrameworkPkg/Sct/print.c                       |   8 +-
.../Support/StandardTest/StandardTest.c            |  91 +--
TestFrameworkPkg/Support/TestLogging/TestLogging.c |  25 +-
TestFrameworkPkg/Support/TestProfile/TestProfile.c | 672 ++++++--------------
.../Support/TestProfile/TestProfile.inf            |   1 +
.../Support/TestRecovery/TestRecovery.c            |   6 +-
TestFrameworkPkg/TestFrameworkPkg.dsc              |   2 +-
103 files changed, 1048 insertions(+), 2195 deletions(-)
delete mode 100644 TestFrameworkPkg/Include/Protocol/WBTest.h
create mode 100644 TestFrameworkPkg/Include/Protocol/WbTest.h
[edk2] [staging/edk2-test PATCH V2 0/6] Fix XCODE and GCC build issues
Posted by Michael Kinney 7 years, 1 month ago
This series fixes a number of XCODE and GCC build compatibility issues
with the edk2-test branch.  It also updates Readme.md with the Linux
build instructions and addresses a few typos.

Changes in V2
* Fix typo in Readme.md
* Fix all unused-but-set-variable GCC compiler errors

Cc: Andrew Fish <afish@apple.com>
Cc: Supreeth Venkatesh <Supreeth.Venkatesh@arm.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Michael Kinney <michael.d.kinney@intel.com>

Michael Kinney (6):
  edk2-test: Update Readme.md
  TestFrameworkPkg: Fix XCODE compatibility issues
  TestFrameworkPkg: Fix VS2015 compatibility issues
  TestFrameworkPkg: Fix GCC compatibility issues
  TestCasePkg: Fix XCODE compatibility issues
  TestCasePkg: Fix GCC compatibility issues

 Readme.md                                          |  52 +-
 TestCasePkg/Timer/ArchTimerBBTestConformance.c     |   7 +-
 TestCasePkg/Timer/ArchTimerBBTestFunction.c        |  12 +-
 TestCasePkg/Timer/ArchTimerBBTestMain.c            |   4 +-
 TestCasePkg/Timer/Guid.h                           |  41 +-
 TestFrameworkPkg/Eftp/ComponentName.c              |   4 +
 TestFrameworkPkg/Eftp/EftpCommon.h                 |   2 +-
 TestFrameworkPkg/Eftp/EftpDriver.h                 |   5 +
 TestFrameworkPkg/Eftp/EftpMain.c                   |   6 +-
 TestFrameworkPkg/Eftp/EftpMain.h                   |   8 +-
 TestFrameworkPkg/Eftp/EftpOption.c                 |  36 +-
 TestFrameworkPkg/Eftp/EftpOption.h                 |   4 +-
 TestFrameworkPkg/Eftp/EftpPacket.c                 |   8 +-
 TestFrameworkPkg/Eftp/EftpPacket.h                 |   4 +-
 TestFrameworkPkg/Eftp/EftpRRQ.c                    |  41 +-
 TestFrameworkPkg/Eftp/EftpRRQ.h                    |   8 +-
 TestFrameworkPkg/Eftp/EftpWRQ.c                    |  24 +-
 TestFrameworkPkg/Eftp/EftpWRQ.h                    |   2 +
 TestFrameworkPkg/Include/Library/EntsLib.h         | 225 -------
 TestFrameworkPkg/Include/Protocol/BbTest.h         |   8 +-
 TestFrameworkPkg/Include/Protocol/Eftp.h           |  24 +-
 .../Include/Protocol/EntsMonitorProtocol.h         |   4 +-
 TestFrameworkPkg/Include/Protocol/LibPrivate.h     |  12 +-
 .../Include/Protocol/StandardTestLibrary.h         |   4 +-
 .../Include/Protocol/TestLoggingLibrary.h          |   4 +-
 .../Include/Protocol/TestOutputLibrary.h           |   4 +-
 .../Include/Protocol/TestProfileLibrary.h          |   9 +-
 .../Include/Protocol/TestRecoveryLibrary.h         |   4 +-
 TestFrameworkPkg/Include/Protocol/TslInit.h        |   4 +-
 TestFrameworkPkg/Include/Protocol/WBTest.h         |  84 ---
 TestFrameworkPkg/Include/Protocol/WbTest.h         |  84 +++
 TestFrameworkPkg/InstallSct/InstallSct.c           |  25 +-
 TestFrameworkPkg/Library/EasLib/EntsContext.c      |  85 +--
 TestFrameworkPkg/Library/EasLib/EntsDpath.c        |  62 +-
 TestFrameworkPkg/Library/EasLib/EntsGuid.c         | 113 ++--
 TestFrameworkPkg/Library/EasLib/EntsLib.c          |  21 +-
 TestFrameworkPkg/Library/EasLib/EntsLib.inf        |  21 +-
 TestFrameworkPkg/Library/EasLib/EntsMisc.c         |   4 +-
 TestFrameworkPkg/Library/EasLib/EntsPrint.c        |   6 +-
 TestFrameworkPkg/Library/EasLib/EntsStr.c          | 690 ---------------------
 TestFrameworkPkg/Library/EasLib/EntsSupport.c      |  50 +-
 TestFrameworkPkg/Library/EasLib/EntsTime.c         |   2 +-
 TestFrameworkPkg/Library/EfiTestLib/EfiTestLib.c   |  22 +-
 .../IP4NetworkMonitor/IP4NetworkMonitor.c          |  38 +-
 .../IP4NetworkMonitor/IP4NetworkMonitor.h          |   8 +-
 .../ManagedNetworkMonitor/ManagedNetworkMonitor.c  |  33 +-
 .../ManagedNetworkMonitor/ManagedNetworkMonitor.h  |   6 +
 .../MonitorServices/SerialMonitor/SerialMonitor.c  |   8 +-
 .../PeiSctManageModule/PeiSctManageModule.c        |  19 +-
 TestFrameworkPkg/Sct/Core/SctInit.c                |   4 +-
 TestFrameworkPkg/Sct/Data/ApTest.c                 |   4 +-
 TestFrameworkPkg/Sct/Data/Category.c               |   2 +-
 TestFrameworkPkg/Sct/Data/TestCase.c               |   2 +-
 TestFrameworkPkg/Sct/Data/TestCaseEx.c             |   2 -
 TestFrameworkPkg/Sct/Data/TestNode.c               |   4 +-
 TestFrameworkPkg/Sct/DeviceConfig/DeviceConfig.c   |  12 +-
 .../Sct/ENTS/EasDispatcher/Arg/EasArg.c            |   2 +-
 TestFrameworkPkg/Sct/ENTS/EasDispatcher/Core/Eas.c |   3 -
 .../Sct/ENTS/EasDispatcher/Core/EasInit.c          |   6 +-
 .../Sct/ENTS/EasDispatcher/Exec/EasCmdDisp.c       |   9 +-
 .../Sct/ENTS/EasDispatcher/Exec/EftpImplement.c    |  17 +-
 .../Sct/ENTS/EasDispatcher/Load/EasSupportFile.c   |  12 +-
 .../Sct/ENTS/EasDispatcher/Load/EasTestFile.c      |  10 +-
 .../Sct/ENTS/EasDispatcher/Rivl/RivlType.c         |   8 +-
 .../Sct/ENTS/EasDispatcher/Rivl/RivlVariable.c     |  25 +-
 TestFrameworkPkg/Sct/Execute/Execute.c             |   5 -
 TestFrameworkPkg/Sct/Execute/ExecuteSupport.c      |  22 +-
 TestFrameworkPkg/Sct/Execute/ExecuteSupport.h      |   1 +
 TestFrameworkPkg/Sct/Execute/Reset.c               |   6 +-
 TestFrameworkPkg/Sct/Include/ApTest.h              |   4 +-
 TestFrameworkPkg/Sct/Include/SctCore.h             |   1 +
 TestFrameworkPkg/Sct/Include/SctDef.h              |   2 +-
 TestFrameworkPkg/Sct/Include/SctOutput.h           |   4 +-
 TestFrameworkPkg/Sct/Load/SupportFile.c            |  32 +-
 TestFrameworkPkg/Sct/Load/TestFile.c               |  14 +-
 TestFrameworkPkg/Sct/Misc/SctMisc.c                |   6 +-
 TestFrameworkPkg/Sct/Operation/Operation.c         |   2 +-
 TestFrameworkPkg/Sct/Report/Report.c               |  14 +-
 TestFrameworkPkg/Sct/Report/ReportConfig.c         |   2 +-
 TestFrameworkPkg/Sct/Report/ReportDatabase.c       |  14 +-
 TestFrameworkPkg/Sct/Report/ReportSupport.c        |  10 +-
 TestFrameworkPkg/Sct/Report/ReportSupport.h        |   8 +-
 TestFrameworkPkg/Sct/UI/BuildMenu.c                |   8 +-
 TestFrameworkPkg/Sct/UI/BuildMenu.h                |  11 +-
 TestFrameworkPkg/Sct/UI/ConfigMenu.c               |  51 +-
 TestFrameworkPkg/Sct/UI/Dialog.h                   |   2 +-
 TestFrameworkPkg/Sct/UI/DisplayUi.c                |  14 +-
 TestFrameworkPkg/Sct/UI/FileDialog.c               |   4 +-
 TestFrameworkPkg/Sct/UI/FileDialog.h               |   2 +-
 TestFrameworkPkg/Sct/UI/KeyFunction.c              |  48 +-
 TestFrameworkPkg/Sct/UI/LogFileDialog.c            |   6 +-
 TestFrameworkPkg/Sct/UI/LogFileDialog.h            |   2 +-
 TestFrameworkPkg/Sct/UI/MainMenu.c                 |  18 +
 TestFrameworkPkg/Sct/UI/TestNodeMenu.c             |  18 +-
 TestFrameworkPkg/Sct/UI/TestNodeMenu.h             |   2 +-
 TestFrameworkPkg/Sct/UI/UI.h                       |  32 +-
 TestFrameworkPkg/Sct/print.c                       |   8 +-
 .../Support/StandardTest/StandardTest.c            |  91 +--
 TestFrameworkPkg/Support/TestLogging/TestLogging.c |  25 +-
 TestFrameworkPkg/Support/TestProfile/TestProfile.c | 672 ++++++--------------
 .../Support/TestProfile/TestProfile.inf            |   1 +
 .../Support/TestRecovery/TestRecovery.c            |   6 +-
 TestFrameworkPkg/TestFrameworkPkg.dsc              |   2 +-
 103 files changed, 1048 insertions(+), 2195 deletions(-)
 delete mode 100644 TestFrameworkPkg/Include/Protocol/WBTest.h
 create mode 100644 TestFrameworkPkg/Include/Protocol/WbTest.h

-- 
2.6.3.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel