mirror of
https://github.com/reactos/CMake.git
synced 2025-03-04 09:57:12 +00:00
Tests: Teach VSWinStorePhone to verify the content of generated appx/msix
Add a test to verify the content of generated UWP app package - appx/msix. MSIX format was introduced Visual Studio 2017 version 15.9.0 and Windows SDK version 17763.
This commit is contained in:
parent
acdb326610
commit
481070a78a
@ -2079,6 +2079,9 @@ ${CMake_SOURCE_DIR}/Utilities/Release/push.bash --dir dev -- '${CMake_BUILD_NIGH
|
||||
--build-config $<CONFIGURATION>
|
||||
--build-options -DCMAKE_SYSTEM_NAME=${systemName}
|
||||
-DCMAKE_SYSTEM_VERSION=${systemVersion}
|
||||
--test-command
|
||||
${CMAKE_CMAKE_COMMAND} -DAPP_PACKAGE_DIR="${CMake_BINARY_DIR}/Tests/VSWinStorePhone/${name}"
|
||||
-P "${CMake_SOURCE_DIR}/Tests/VSWinStorePhone/VerifyAppPackage.cmake"
|
||||
)
|
||||
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/VSWinStorePhone/${name}")
|
||||
endmacro()
|
||||
|
@ -9,6 +9,7 @@ elseif(MSVC_VERSION GREATER 1600)
|
||||
endif()
|
||||
|
||||
add_subdirectory(WinRT)
|
||||
add_subdirectory(CxxDLL)
|
||||
|
||||
set (APP_MANIFEST_NAME Package.appxmanifest)
|
||||
if("${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsPhone")
|
||||
@ -151,4 +152,4 @@ if("${SHORT_VERSION}" STREQUAL "10.0")
|
||||
set_property(TARGET ${EXE_NAME} PROPERTY VS_SDK_REFERENCES "Microsoft.UniversalCRT.Debug, Version=${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")
|
||||
endif()
|
||||
|
||||
target_link_libraries(${EXE_NAME} d3d11 JusticeLeagueWinRT)
|
||||
target_link_libraries(${EXE_NAME} d3d11 JusticeLeagueWinRT CxxDll)
|
||||
|
3
Tests/VSWinStorePhone/CxxDLL/CMakeLists.txt
Normal file
3
Tests/VSWinStorePhone/CxxDLL/CMakeLists.txt
Normal file
@ -0,0 +1,3 @@
|
||||
project(CxxDll CXX)
|
||||
|
||||
add_library(CxxDll SHARED cxxdll.cpp)
|
7
Tests/VSWinStorePhone/CxxDLL/cxxdll.cpp
Normal file
7
Tests/VSWinStorePhone/CxxDLL/cxxdll.cpp
Normal file
@ -0,0 +1,7 @@
|
||||
#include "cxxdll.h"
|
||||
#include <iostream>
|
||||
|
||||
void CxxDllClass::SomeMethod()
|
||||
{
|
||||
std::cout << "CxxDllClass::SomeMethod\n";
|
||||
}
|
5
Tests/VSWinStorePhone/CxxDLL/cxxdll.h
Normal file
5
Tests/VSWinStorePhone/CxxDLL/cxxdll.h
Normal file
@ -0,0 +1,5 @@
|
||||
class __declspec(dllexport) CxxDllClass
|
||||
{
|
||||
public:
|
||||
static void SomeMethod();
|
||||
};
|
34
Tests/VSWinStorePhone/VerifyAppPackage.cmake
Normal file
34
Tests/VSWinStorePhone/VerifyAppPackage.cmake
Normal file
@ -0,0 +1,34 @@
|
||||
set(APP_PKG_NAME Direct3DApp1)
|
||||
|
||||
# List of files that are expected to be present in the generated app package
|
||||
set(EXPECTED_APP_PKG_CONTENT
|
||||
${APP_PKG_NAME}.exe
|
||||
CxxDll.dll
|
||||
JusticeLeagueWinRT.winmd
|
||||
JusticeLeagueWinRT.dll
|
||||
)
|
||||
|
||||
# Windows app package formats can be either appx or msix
|
||||
file(GLOB_RECURSE ALL_APP_PKG_FILES ${APP_PACKAGE_DIR}/AppPackages ${APP_PKG_NAME}*.appx ${APP_PKG_NAME}*.msix)
|
||||
|
||||
# There can be only one generated app package
|
||||
list(LENGTH ALL_APP_PKG_FILES APP_PKG_COUNT)
|
||||
if(NOT APP_PKG_COUNT EQUAL 1)
|
||||
message(FATAL_ERROR "Expected 1 generated app package, but detected ${APP_PKG_COUNT}: ${ALL_APP_PKG_FILES}")
|
||||
endif()
|
||||
|
||||
execute_process(COMMAND ${CMAKE_COMMAND} -E tar tf ${ALL_APP_PKG_FILES}
|
||||
OUTPUT_VARIABLE APP_PKG_CONTENT_OUTPUT
|
||||
ERROR_VARIABLE error
|
||||
RESULT_VARIABLE result)
|
||||
|
||||
if(NOT result EQUAL 0)
|
||||
message(FATAL_ERROR "Listing app package content failed with: ${error}")
|
||||
endif()
|
||||
|
||||
foreach(app_pkg_item ${EXPECTED_APP_PKG_CONTENT})
|
||||
string(FIND ${APP_PKG_CONTENT_OUTPUT} ${app_pkg_item} _found)
|
||||
if(_found EQUAL -1)
|
||||
message(FATAL_ERROR "Generated app package is missing an expected item: ${app_pkg_item}")
|
||||
endif()
|
||||
endforeach()
|
Loading…
x
Reference in New Issue
Block a user