whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revive tst_qresourceengine 

This test was not ported to CMake yet.

Pick-to: 6.2
Fixes: QTBUG-88601
Change-Id: Ied3b1a0e2ddfbcf003cb0d8d01d5f64cb83cf4e7
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
bb10
Joerg Bornemann 2021-08-23 12:45:42 +02:00
parent 8694104809
commit d9f8b68963
5 changed files with 68 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/corelib/io/CMakeLists.txt
View File

@ -29,7 +29,7 @@ if(TARGET Qt::Concurrent)
endif()
if(NOT ANDROID)
add_subdirectory(qdir)
# add_subdirectory(qresourceengine) # special case needs fixes
add_subdirectory(qresourceengine)
endif()
if(QT_FEATURE_private_tests OR UNIX)
add_subdirectory(qfilesystementry)

44
tests/auto/corelib/io/qresourceengine/CMakeLists.txt Normal file
View File

@ -0,0 +1,44 @@
#####################################################################
## tst_qresourceengine Test:
#####################################################################
if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
cmake_minimum_required(VERSION 3.16)
project(tst_qresourceengine LANGUAGES C CXX ASM)
find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
endif()
# Collect test data
set(test_data "parentdir.txt")
file(GLOB_RECURSE test_data_glob
RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
testqrc/*)
list(APPEND test_data ${test_data_glob})
file(GLOB_RECURSE test_data_glob
RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
*.rcc)
list(APPEND test_data ${test_data_glob})
qt_internal_add_test(tst_qresourceengine
SOURCES
tst_qresourceengine.cpp
LIBRARIES
Qt::CorePrivate
moctestplugin
TESTDATA ${test_data}
)
qt_add_resources(additional_sources testqrc/test.qrc)
target_sources(tst_qresourceengine PRIVATE ${additional_sources})
if(ANDROID AND NOT ANDROID_EMBEDDED)
qt_add_resources(additional_sources android_testdata.qrc)
target_sources(tst_qresourceengine PRIVATE ${additional_sources})
endif()
qt_add_binary_resources(tst_qresourceengine_runtime_resource "testqrc/test.qrc"
DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/runtime_resource.rcc"
OPTIONS -root "/runtime_resource/" -binary)
add_dependencies(tst_qresourceengine tst_qresourceengine_runtime_resource)
add_subdirectory(staticplugin)

1
tests/auto/corelib/io/qresourceengine/staticplugin/.gitignore vendored
View File

@ -1 +0,0 @@
moctestplugin_plugin_resources.cpp

22
tests/auto/corelib/io/qresourceengine/staticplugin/CMakeLists.txt Normal file
View File

@ -0,0 +1,22 @@
#####################################################################
## moctestplugin Generic Library:
#####################################################################
qt_internal_add_cmake_library(moctestplugin
STATIC
SOURCES
main.cpp
LIBRARIES
Qt::Core
DEFINES
QT_STATICPLUGIN
)
qt_internal_add_resource(moctestplugin "qmake_plugin_resource"
PREFIX
"/staticplugin"
FILES
"main.cpp"
)
qt_autogen_tools_initial_setup(moctestplugin)

2
tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp
View File

@ -488,7 +488,7 @@ void tst_QResourceEngine::checkStructure()
void tst_QResourceEngine::searchPath_data()
{
auto searchPath = QFileInfo(QFINDTESTDATA("testqrc")).canonicalFilePath();
auto searchPath = QFileInfo(QT_TESTCASE_SOURCEDIR "/testqrc").canonicalFilePath();
QTest::addColumn<QString>("searchPathPrefix");
QTest::addColumn<QString>("searchPath");