Port more tests from tests/auto/corelib/tools to CMake
Also removed add_subdirectory calls for subdirs which no longer exist. Change-Id: I759f408ca812e1721dde495b0e23feffdeeb9c60 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
parent
9b51d5f571
commit
3a34fdf72a
@ -1,30 +1,26 @@
|
|||||||
# Generated from tools.pro.
|
# Generated from tools.pro.
|
||||||
|
|
||||||
# add_subdirectory(collections) # special case not ported
|
add_subdirectory(collections)
|
||||||
# add_subdirectory(containerapisymmetry) # special case not ported
|
add_subdirectory(containerapisymmetry)
|
||||||
add_subdirectory(qalgorithms)
|
add_subdirectory(qalgorithms)
|
||||||
add_subdirectory(qarraydata)
|
add_subdirectory(qarraydata)
|
||||||
# add_subdirectory(qarraydata_strictiterators) # special case not ported
|
|
||||||
add_subdirectory(qbitarray)
|
add_subdirectory(qbitarray)
|
||||||
add_subdirectory(qcache)
|
add_subdirectory(qcache)
|
||||||
add_subdirectory(qcommandlineparser)
|
add_subdirectory(qcommandlineparser)
|
||||||
add_subdirectory(qcontiguouscache)
|
add_subdirectory(qcontiguouscache)
|
||||||
# add_subdirectory(qcryptographichash) # special case not ported
|
add_subdirectory(qcryptographichash)
|
||||||
add_subdirectory(qeasingcurve)
|
add_subdirectory(qeasingcurve)
|
||||||
add_subdirectory(qexplicitlyshareddatapointer)
|
add_subdirectory(qexplicitlyshareddatapointer)
|
||||||
# add_subdirectory(qfreelist) # special case not ported
|
add_subdirectory(qflatmap)
|
||||||
|
add_subdirectory(qfreelist)
|
||||||
add_subdirectory(qhash)
|
add_subdirectory(qhash)
|
||||||
# add_subdirectory(qhash_strictiterators) # special case not ported
|
|
||||||
add_subdirectory(qhashfunctions)
|
add_subdirectory(qhashfunctions)
|
||||||
# add_subdirectory(qline) # special case not ported
|
add_subdirectory(qline)
|
||||||
# add_subdirectory(qlist) # special case no longer exists
|
|
||||||
# add_subdirectory(qlist_strictiterators) # special case not ported
|
|
||||||
add_subdirectory(qmakearray)
|
add_subdirectory(qmakearray)
|
||||||
add_subdirectory(qmap)
|
add_subdirectory(qmap)
|
||||||
# add_subdirectory(qmap_strictiterators) # special case not ported
|
|
||||||
add_subdirectory(qmargins)
|
add_subdirectory(qmargins)
|
||||||
add_subdirectory(qmessageauthenticationcode)
|
add_subdirectory(qmessageauthenticationcode)
|
||||||
# add_subdirectory(qoffsetstringarray) # special case not ported
|
add_subdirectory(qoffsetstringarray)
|
||||||
add_subdirectory(qpair)
|
add_subdirectory(qpair)
|
||||||
add_subdirectory(qpoint)
|
add_subdirectory(qpoint)
|
||||||
add_subdirectory(qpointf)
|
add_subdirectory(qpointf)
|
||||||
@ -42,9 +38,8 @@ add_subdirectory(qsizef)
|
|||||||
add_subdirectory(qstl)
|
add_subdirectory(qstl)
|
||||||
add_subdirectory(qtimeline)
|
add_subdirectory(qtimeline)
|
||||||
add_subdirectory(qvarlengtharray)
|
add_subdirectory(qvarlengtharray)
|
||||||
# add_subdirectory(qvector) # special case not ported
|
add_subdirectory(qvector)
|
||||||
# add_subdirectory(qvector_strictiterators) # special case not ported
|
add_subdirectory(qversionnumber)
|
||||||
# add_subdirectory(qversionnumber) # special case not ported
|
|
||||||
if(APPLE)
|
if(APPLE)
|
||||||
# add_subdirectory(qmacautoreleasepool) # special case not ported
|
add_subdirectory(qmacautoreleasepool)
|
||||||
endif()
|
endif()
|
||||||
|
12
tests/auto/corelib/tools/collections/.prev_CMakeLists.txt
Normal file
12
tests/auto/corelib/tools/collections/.prev_CMakeLists.txt
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
# Generated from collections.pro.
|
||||||
|
|
||||||
|
#####################################################################
|
||||||
|
## tst_collections Test:
|
||||||
|
#####################################################################
|
||||||
|
|
||||||
|
qt_add_test(tst_collections
|
||||||
|
SOURCES
|
||||||
|
tst_collections.cpp
|
||||||
|
DEFINES
|
||||||
|
-QT_NO_JAVA_STYLE_ITERATORS
|
||||||
|
)
|
12
tests/auto/corelib/tools/collections/CMakeLists.txt
Normal file
12
tests/auto/corelib/tools/collections/CMakeLists.txt
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
# Generated from collections.pro.
|
||||||
|
|
||||||
|
#####################################################################
|
||||||
|
## tst_collections Test:
|
||||||
|
#####################################################################
|
||||||
|
|
||||||
|
qt_add_test(tst_collections
|
||||||
|
SOURCES
|
||||||
|
tst_collections.cpp
|
||||||
|
DEFINES
|
||||||
|
# -QT_NO_JAVA_STYLE_ITERATORS # special case remove
|
||||||
|
)
|
10
tests/auto/corelib/tools/containerapisymmetry/CMakeLists.txt
Normal file
10
tests/auto/corelib/tools/containerapisymmetry/CMakeLists.txt
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
# Generated from containerapisymmetry.pro.
|
||||||
|
|
||||||
|
#####################################################################
|
||||||
|
## tst_containerapisymmetry Test:
|
||||||
|
#####################################################################
|
||||||
|
|
||||||
|
qt_add_test(tst_containerapisymmetry
|
||||||
|
SOURCES
|
||||||
|
tst_containerapisymmetry.cpp
|
||||||
|
)
|
35
tests/auto/corelib/tools/qcryptographichash/CMakeLists.txt
Normal file
35
tests/auto/corelib/tools/qcryptographichash/CMakeLists.txt
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
# Generated from qcryptographichash.pro.
|
||||||
|
|
||||||
|
#####################################################################
|
||||||
|
## tst_qcryptographichash Test:
|
||||||
|
#####################################################################
|
||||||
|
|
||||||
|
# Collect test data
|
||||||
|
file(GLOB_RECURSE test_data_glob
|
||||||
|
RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
|
data/*)
|
||||||
|
list(APPEND test_data ${test_data_glob})
|
||||||
|
|
||||||
|
qt_add_test(tst_qcryptographichash
|
||||||
|
SOURCES
|
||||||
|
tst_qcryptographichash.cpp
|
||||||
|
TESTDATA ${test_data}
|
||||||
|
)
|
||||||
|
|
||||||
|
## Scopes:
|
||||||
|
#####################################################################
|
||||||
|
|
||||||
|
if(ANDROID AND NOT ANDROID_EMBEDDED)
|
||||||
|
# Resources:
|
||||||
|
set(testdata_resource_files
|
||||||
|
"data/2c1517dad3678f03917f15849b052fd5.md5"
|
||||||
|
"data/d41d8cd98f00b204e9800998ecf8427e.md5"
|
||||||
|
)
|
||||||
|
|
||||||
|
qt_add_resource(tst_qcryptographichash "testdata"
|
||||||
|
PREFIX
|
||||||
|
"/"
|
||||||
|
FILES
|
||||||
|
${testdata_resource_files}
|
||||||
|
)
|
||||||
|
endif()
|
12
tests/auto/corelib/tools/qflatmap/CMakeLists.txt
Normal file
12
tests/auto/corelib/tools/qflatmap/CMakeLists.txt
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
# Generated from qflatmap.pro.
|
||||||
|
|
||||||
|
#####################################################################
|
||||||
|
## tst_qflatmap Test:
|
||||||
|
#####################################################################
|
||||||
|
|
||||||
|
qt_add_test(tst_qflatmap
|
||||||
|
SOURCES
|
||||||
|
tst_qflatmap.cpp
|
||||||
|
PUBLIC_LIBRARIES
|
||||||
|
Qt::CorePrivate
|
||||||
|
)
|
20
tests/auto/corelib/tools/qfreelist/CMakeLists.txt
Normal file
20
tests/auto/corelib/tools/qfreelist/CMakeLists.txt
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
# Generated from qfreelist.pro.
|
||||||
|
|
||||||
|
#####################################################################
|
||||||
|
## tst_qfreelist Test:
|
||||||
|
#####################################################################
|
||||||
|
|
||||||
|
qt_add_test(tst_qfreelist
|
||||||
|
SOURCES
|
||||||
|
tst_qfreelist.cpp
|
||||||
|
PUBLIC_LIBRARIES
|
||||||
|
Qt::CorePrivate
|
||||||
|
)
|
||||||
|
|
||||||
|
## Scopes:
|
||||||
|
#####################################################################
|
||||||
|
|
||||||
|
qt_extend_target(tst_qfreelist CONDITION NOT QT_FEATURE_private_tests
|
||||||
|
SOURCES
|
||||||
|
${QT_SOURCE_TREE}/src/corelib/tools/qfreelist.cpp
|
||||||
|
)
|
18
tests/auto/corelib/tools/qline/CMakeLists.txt
Normal file
18
tests/auto/corelib/tools/qline/CMakeLists.txt
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
# Generated from qline.pro.
|
||||||
|
|
||||||
|
#####################################################################
|
||||||
|
## tst_qline Test:
|
||||||
|
#####################################################################
|
||||||
|
|
||||||
|
qt_add_test(tst_qline
|
||||||
|
SOURCES
|
||||||
|
tst_qline.cpp
|
||||||
|
)
|
||||||
|
|
||||||
|
## Scopes:
|
||||||
|
#####################################################################
|
||||||
|
|
||||||
|
qt_extend_target(tst_qline CONDITION UNIX AND NOT APPLE AND NOT HAIKU AND NOT INTEGRITY AND NOT VXWORKS
|
||||||
|
PUBLIC_LIBRARIES
|
||||||
|
m
|
||||||
|
)
|
12
tests/auto/corelib/tools/qmacautoreleasepool/CMakeLists.txt
Normal file
12
tests/auto/corelib/tools/qmacautoreleasepool/CMakeLists.txt
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
# Generated from qmacautoreleasepool.pro.
|
||||||
|
|
||||||
|
#####################################################################
|
||||||
|
## tst_qmacautoreleasepool Test:
|
||||||
|
#####################################################################
|
||||||
|
|
||||||
|
qt_add_test(tst_qmacautoreleasepool
|
||||||
|
SOURCES
|
||||||
|
tst_qmacautoreleasepool.mm
|
||||||
|
PUBLIC_LIBRARIES
|
||||||
|
${FWFoundation}
|
||||||
|
)
|
12
tests/auto/corelib/tools/qoffsetstringarray/CMakeLists.txt
Normal file
12
tests/auto/corelib/tools/qoffsetstringarray/CMakeLists.txt
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
# Generated from qoffsetstringarray.pro.
|
||||||
|
|
||||||
|
#####################################################################
|
||||||
|
## tst_qoffsetstringarray Test:
|
||||||
|
#####################################################################
|
||||||
|
|
||||||
|
qt_add_test(tst_qoffsetstringarray
|
||||||
|
SOURCES
|
||||||
|
tst_qoffsetstringarray.cpp
|
||||||
|
PUBLIC_LIBRARIES
|
||||||
|
Qt::CorePrivate
|
||||||
|
)
|
13
tests/auto/corelib/tools/qvector/CMakeLists.txt
Normal file
13
tests/auto/corelib/tools/qvector/CMakeLists.txt
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
# Generated from qvector.pro.
|
||||||
|
|
||||||
|
#####################################################################
|
||||||
|
## tst_qvector Test:
|
||||||
|
#####################################################################
|
||||||
|
|
||||||
|
qt_add_test(tst_qvector
|
||||||
|
SOURCES
|
||||||
|
tst_qvector.cpp
|
||||||
|
)
|
||||||
|
|
||||||
|
## Scopes:
|
||||||
|
#####################################################################
|
13
tests/auto/corelib/tools/qversionnumber/CMakeLists.txt
Normal file
13
tests/auto/corelib/tools/qversionnumber/CMakeLists.txt
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
# Generated from qversionnumber.pro.
|
||||||
|
|
||||||
|
#####################################################################
|
||||||
|
## tst_qversionnumber Test:
|
||||||
|
#####################################################################
|
||||||
|
|
||||||
|
qt_add_test(tst_qversionnumber
|
||||||
|
SOURCES
|
||||||
|
tst_qversionnumber.cpp
|
||||||
|
)
|
||||||
|
|
||||||
|
## Scopes:
|
||||||
|
#####################################################################
|
Loading…
x
Reference in New Issue
Block a user