From 7947032e2d1d68b2c0f79874db7adcf560851f29 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 12 Aug 2019 13:55:40 +0200 Subject: Regenerate coreliob/io tests With a few special cases to make the tests pass. Biggest one is the qlockfile_test_helper. Also a few tests have some problems and have not been ported yet: qfileselector, qresourceengine, qprocess. Change-Id: I91a5210b13e7a0697774d909449a71f46af0a0ba Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann --- tests/auto/corelib/io/.prev_CMakeLists.txt | 56 +++++++++++++ tests/auto/corelib/io/CMakeLists.txt | 63 ++++++++++++--- tests/auto/corelib/io/largefile/CMakeLists.txt | 14 +++- .../corelib/io/qabstractfileengine/CMakeLists.txt | 14 ++-- tests/auto/corelib/io/qbuffer/CMakeLists.txt | 12 ++- tests/auto/corelib/io/qdataurl/CMakeLists.txt | 14 +++- tests/auto/corelib/io/qdebug/CMakeLists.txt | 4 +- tests/auto/corelib/io/qdir/CMakeLists.txt | 91 ++++++++++++++++++++++ .../corelib/io/qdir/testdir/dir/CMakeLists.txt | 13 ++++ tests/auto/corelib/io/qdiriterator/CMakeLists.txt | 19 +++-- tests/auto/corelib/io/qfile/.prev_CMakeLists.txt | 78 +++++++++++++++++++ tests/auto/corelib/io/qfile/CMakeLists.txt | 46 ++++++++--- .../corelib/io/qfile/stdinprocess/CMakeLists.txt | 5 +- tests/auto/corelib/io/qfileinfo/CMakeLists.txt | 26 ++++--- tests/auto/corelib/io/qfileselector/CMakeLists.txt | 66 ---------------- .../corelib/io/qfilesystementry/CMakeLists.txt | 3 - .../corelib/io/qfilesystemmetadata/CMakeLists.txt | 4 +- .../corelib/io/qfilesystemwatcher/CMakeLists.txt | 12 ++- tests/auto/corelib/io/qiodevice/CMakeLists.txt | 15 +++- tests/auto/corelib/io/qipaddress/CMakeLists.txt | 14 +++- tests/auto/corelib/io/qlockfile/CMakeLists.txt | 24 ++++++ .../qlockfiletesthelper/.prev_CMakeLists.txt | 11 +++ .../qlockfile/qlockfiletesthelper/CMakeLists.txt | 12 +++ .../corelib/io/qloggingcategory/CMakeLists.txt | 17 +++- .../corelib/io/qloggingregistry/CMakeLists.txt | 15 +++- tests/auto/corelib/io/qnodebug/CMakeLists.txt | 12 ++- .../io/qprocess-noapplication/CMakeLists.txt | 11 +++ .../corelib/io/qprocessenvironment/CMakeLists.txt | 12 ++- tests/auto/corelib/io/qsavefile/CMakeLists.txt | 9 ++- tests/auto/corelib/io/qsettings/CMakeLists.txt | 26 ++++--- .../auto/corelib/io/qstandardpaths/CMakeLists.txt | 10 ++- tests/auto/corelib/io/qstorageinfo/CMakeLists.txt | 14 +++- tests/auto/corelib/io/qtemporarydir/CMakeLists.txt | 4 +- .../auto/corelib/io/qtemporaryfile/CMakeLists.txt | 27 ++++--- tests/auto/corelib/io/qurl/CMakeLists.txt | 6 +- tests/auto/corelib/io/qurlinternal/CMakeLists.txt | 4 +- tests/auto/corelib/io/qurlquery/CMakeLists.txt | 16 +++- 37 files changed, 615 insertions(+), 184 deletions(-) create mode 100644 tests/auto/corelib/io/.prev_CMakeLists.txt create mode 100644 tests/auto/corelib/io/qdir/CMakeLists.txt create mode 100644 tests/auto/corelib/io/qdir/testdir/dir/CMakeLists.txt create mode 100644 tests/auto/corelib/io/qfile/.prev_CMakeLists.txt delete mode 100644 tests/auto/corelib/io/qfileselector/CMakeLists.txt create mode 100644 tests/auto/corelib/io/qlockfile/CMakeLists.txt create mode 100644 tests/auto/corelib/io/qlockfile/qlockfiletesthelper/.prev_CMakeLists.txt create mode 100644 tests/auto/corelib/io/qlockfile/qlockfiletesthelper/CMakeLists.txt create mode 100644 tests/auto/corelib/io/qprocess-noapplication/CMakeLists.txt (limited to 'tests/auto/corelib/io') diff --git a/tests/auto/corelib/io/.prev_CMakeLists.txt b/tests/auto/corelib/io/.prev_CMakeLists.txt new file mode 100644 index 0000000000..5baf4c35de --- /dev/null +++ b/tests/auto/corelib/io/.prev_CMakeLists.txt @@ -0,0 +1,56 @@ +# Generated from io.pro. + +if(QT_FEATURE_private_tests) + add_subdirectory(qabstractfileengine) + add_subdirectory(qfileinfo) + add_subdirectory(qipaddress) + add_subdirectory(qloggingregistry) + add_subdirectory(qurlinternal) +endif() +add_subdirectory(qbuffer) +add_subdirectory(qdataurl) +add_subdirectory(qdiriterator) +add_subdirectory(qfile) +add_subdirectory(largefile) +add_subdirectory(qfileselector) +add_subdirectory(qfilesystemmetadata) +add_subdirectory(qloggingcategory) +add_subdirectory(qnodebug) +add_subdirectory(qsavefile) +add_subdirectory(qstandardpaths) +add_subdirectory(qtemporarydir) +add_subdirectory(qtemporaryfile) +add_subdirectory(qurlquery) +if(TARGET Qt::Concurrent) + add_subdirectory(qdebug) + add_subdirectory(qlockfile) + add_subdirectory(qurl) +endif() +if(NOT ANDROID) + add_subdirectory(qdir) + add_subdirectory(qresourceengine) +endif() +if(QT_FEATURE_private_tests OR UNIX) + add_subdirectory(qfilesystementry) +endif() +if(QT_FEATURE_filesystemwatcher) + add_subdirectory(qfilesystemwatcher) +endif() +if(TARGET Qt::Network) + add_subdirectory(qiodevice) +endif() +if(QT_FEATURE_process AND TARGET Qt::Network AND NOT ANDROID) + add_subdirectory(qprocess) +endif() +if(QT_FEATURE_process) + add_subdirectory(qprocess-noapplication) +endif() +if(QT_FEATURE_processenvironment) + add_subdirectory(qprocessenvironment) +endif() +if(QT_FEATURE_settings AND TARGET Qt::Gui) + add_subdirectory(qsettings) +endif() +if(NOT WINRT) + add_subdirectory(qstorageinfo) +endif() diff --git a/tests/auto/corelib/io/CMakeLists.txt b/tests/auto/corelib/io/CMakeLists.txt index 539a9d9242..cb1246c3a2 100644 --- a/tests/auto/corelib/io/CMakeLists.txt +++ b/tests/auto/corelib/io/CMakeLists.txt @@ -1,15 +1,56 @@ -add_subdirectory(largefile) -add_subdirectory(qabstractfileengine) -add_subdirectory(qbuffer) -add_subdirectory(qdataurl) +# Generated from io.pro. + if(QT_FEATURE_private_tests) - add_subdirectory(qfilesystementry) + add_subdirectory(qabstractfileengine) + add_subdirectory(qfileinfo) + add_subdirectory(qipaddress) + add_subdirectory(qloggingregistry) + add_subdirectory(qurlinternal) endif() -add_subdirectory(qfilesystemwatcher) -add_subdirectory(qipaddress) -# add_subdirectory(qloggingcategory) +add_subdirectory(qbuffer) +add_subdirectory(qdataurl) +add_subdirectory(qdiriterator) +add_subdirectory(qfile) +add_subdirectory(largefile) +# add_subdirectory(qfileselector) # special case needs fixes +add_subdirectory(qfilesystemmetadata) +add_subdirectory(qloggingcategory) add_subdirectory(qnodebug) -add_subdirectory(qprocessenvironment) -add_subdirectory(qstorageinfo) +add_subdirectory(qsavefile) +add_subdirectory(qstandardpaths) +add_subdirectory(qtemporarydir) +add_subdirectory(qtemporaryfile) add_subdirectory(qurlquery) - +if(TARGET Qt::Concurrent) + add_subdirectory(qdebug) + add_subdirectory(qlockfile) + add_subdirectory(qurl) +endif() +if(NOT ANDROID) + add_subdirectory(qdir) + # add_subdirectory(qresourceengine) # special case needs fixes +endif() +if(QT_FEATURE_private_tests OR UNIX) + add_subdirectory(qfilesystementry) +endif() +if(QT_FEATURE_filesystemwatcher) + add_subdirectory(qfilesystemwatcher) +endif() +if(TARGET Qt::Network) + add_subdirectory(qiodevice) +endif() +if(QT_FEATURE_process AND TARGET Qt::Network AND NOT ANDROID) + # add_subdirectory(qprocess) # special case needs fixes +endif() +if(QT_FEATURE_process) + add_subdirectory(qprocess-noapplication) +endif() +if(QT_FEATURE_processenvironment) + add_subdirectory(qprocessenvironment) +endif() +if(QT_FEATURE_settings AND TARGET Qt::Gui) + add_subdirectory(qsettings) +endif() +if(NOT WINRT) + add_subdirectory(qstorageinfo) +endif() diff --git a/tests/auto/corelib/io/largefile/CMakeLists.txt b/tests/auto/corelib/io/largefile/CMakeLists.txt index d85cfd73b4..7bf8189b73 100644 --- a/tests/auto/corelib/io/largefile/CMakeLists.txt +++ b/tests/auto/corelib/io/largefile/CMakeLists.txt @@ -1,6 +1,14 @@ -add_qt_test(tst_largefile SOURCES - tst_largefile.cpp +# Generated from largefile.pro. + +##################################################################### +## tst_largefile Test: +##################################################################### + +add_qt_test(tst_largefile + GUI + SOURCES ../../../../shared/emulationdetector.h + tst_largefile.cpp INCLUDE_DIRECTORIES - ../../../../shared/ + ../../../../shared ) diff --git a/tests/auto/corelib/io/qabstractfileengine/CMakeLists.txt b/tests/auto/corelib/io/qabstractfileengine/CMakeLists.txt index 97c9ba7969..aac371389f 100644 --- a/tests/auto/corelib/io/qabstractfileengine/CMakeLists.txt +++ b/tests/auto/corelib/io/qabstractfileengine/CMakeLists.txt @@ -5,18 +5,18 @@ ##################################################################### add_qt_test(tst_qabstractfileengine + GUI SOURCES tst_qabstractfileengine.cpp LIBRARIES Qt::CorePrivate - PUBLIC_LIBRARIES - Qt::Core ) # Resources: -add_qt_resource(tst_qabstractfileengine "qabstractfileengine" PREFIX "/tst_qabstractfileengine/" FILES - resources/) - +add_qt_resource(tst_qabstractfileengine "qabstractfileengine" + PREFIX + "/tst_qabstractfileengine/" + FILES + "resources/" +) -#### Keys ignored in scope 1:.:.:qabstractfileengine.pro:: -# CONFIG = "testcase" diff --git a/tests/auto/corelib/io/qbuffer/CMakeLists.txt b/tests/auto/corelib/io/qbuffer/CMakeLists.txt index 3ed9738217..992960de37 100644 --- a/tests/auto/corelib/io/qbuffer/CMakeLists.txt +++ b/tests/auto/corelib/io/qbuffer/CMakeLists.txt @@ -1 +1,11 @@ -add_qt_test(tst_qbuffer SOURCES tst_qbuffer.cpp) +# Generated from qbuffer.pro. + +##################################################################### +## tst_qbuffer Test: +##################################################################### + +add_qt_test(tst_qbuffer + GUI + SOURCES + tst_qbuffer.cpp +) diff --git a/tests/auto/corelib/io/qdataurl/CMakeLists.txt b/tests/auto/corelib/io/qdataurl/CMakeLists.txt index d24b18dfc9..479321205e 100644 --- a/tests/auto/corelib/io/qdataurl/CMakeLists.txt +++ b/tests/auto/corelib/io/qdataurl/CMakeLists.txt @@ -1 +1,13 @@ -add_qt_test(tst_qdataurl SOURCES tst_qdataurl.cpp LIBRARIES Qt::CorePrivate) +# Generated from qdataurl.pro. + +##################################################################### +## tst_qdataurl Test: +##################################################################### + +add_qt_test(tst_qdataurl + GUI + SOURCES + tst_qdataurl.cpp + LIBRARIES + Qt::CorePrivate +) diff --git a/tests/auto/corelib/io/qdebug/CMakeLists.txt b/tests/auto/corelib/io/qdebug/CMakeLists.txt index f19d6bad45..15cb6f4e20 100644 --- a/tests/auto/corelib/io/qdebug/CMakeLists.txt +++ b/tests/auto/corelib/io/qdebug/CMakeLists.txt @@ -5,11 +5,9 @@ ##################################################################### add_qt_test(tst_qdebug + GUI SOURCES tst_qdebug.cpp PUBLIC_LIBRARIES Qt::Concurrent ) - -#### Keys ignored in scope 1:.:.:qdebug.pro:: -# CONFIG = "testcase" diff --git a/tests/auto/corelib/io/qdir/CMakeLists.txt b/tests/auto/corelib/io/qdir/CMakeLists.txt new file mode 100644 index 0000000000..89c79c314c --- /dev/null +++ b/tests/auto/corelib/io/qdir/CMakeLists.txt @@ -0,0 +1,91 @@ +# Generated from qdir.pro. + +##################################################################### +## tst_qdir Test: +##################################################################### + +# Collect test data +list(APPEND test_data "testdir") +list(APPEND test_data "testData") +list(APPEND test_data "searchdir") +list(APPEND test_data "resources") +list(APPEND test_data "entrylist") +list(APPEND test_data "types") +list(APPEND test_data "tst_qdir.cpp") + +add_qt_test(tst_qdir + GUI + SOURCES + tst_qdir.cpp + LIBRARIES + Qt::CorePrivate + TESTDATA ${test_data} +) + +# Resources: +add_qt_resource(tst_qdir "qdir" + PREFIX + "/tst_qdir/" + FILES + "resources/entryList/" +) + + +## Scopes: +##################################################################### + +#### Keys ignored in scope 2:.:.:qdir.pro:APPLE_IOS: +# QMAKE_INFO_PLIST = "Info.plist" + +extend_target(tst_qdir CONDITION CONFIG___contains___builtin_testdata + DEFINES + BUILTIN_TESTDATA +) + +# Resources: +add_qt_resource(tst_qdir "android_testdata" + PREFIX + "/android_testdata" + FILES + "entrylist/directory/dummy" + "entrylist/file" + "resources/entryList/file1.data" + "resources/entryList/file2.data" + "resources/entryList/file3.data" + "resources/entryList/file4.nothing" + "searchdir/subdir1/picker.png" + "searchdir/subdir2/picker.png" + "testData/empty" + "testdir/dir/qdir.pro" + "testdir/dir/qrc_qdir.cpp" + "testdir/dir/tmp/empty" + "testdir/dir/tst_qdir.cpp" + "testdir/spaces/foo. bar" + "testdir/spaces/foo.bar" + "tst_qdir.cpp" + "types/a" + "types/a.a" + "types/a.b" + "types/a.c" + "types/b" + "types/b.a" + "types/b.b" + "types/b.c" + "types/c" + "types/c.a" + "types/c.b" + "types/c.c" + "types/d.a/dummy" + "types/d.b/dummy" + "types/d.c/dummy" + "types/d/dummy" + "types/e.a/dummy" + "types/e.b/dummy" + "types/e.c/dummy" + "types/e/dummy" + "types/f.a/dummy" + "types/f.b/dummy" + "types/f.c/dummy" + "types/f/dummy" +) + diff --git a/tests/auto/corelib/io/qdir/testdir/dir/CMakeLists.txt b/tests/auto/corelib/io/qdir/testdir/dir/CMakeLists.txt new file mode 100644 index 0000000000..e50fcb60ca --- /dev/null +++ b/tests/auto/corelib/io/qdir/testdir/dir/CMakeLists.txt @@ -0,0 +1,13 @@ +# Generated from qdir.pro. + +##################################################################### +## qdir Binary: +##################################################################### + +add_qt_executable(qdir + GUI + DEFINES + QT_DISABLE_DEPRECATED_BEFORE=0 + PUBLIC_LIBRARIES + Qt::Gui +) diff --git a/tests/auto/corelib/io/qdiriterator/CMakeLists.txt b/tests/auto/corelib/io/qdiriterator/CMakeLists.txt index 098f3f1d37..cbdfc57314 100644 --- a/tests/auto/corelib/io/qdiriterator/CMakeLists.txt +++ b/tests/auto/corelib/io/qdiriterator/CMakeLists.txt @@ -4,22 +4,27 @@ ## tst_qdiriterator Test: ##################################################################### +# Collect test data +list(APPEND test_data "entrylist") + add_qt_test(tst_qdiriterator + GUI SOURCES tst_qdiriterator.cpp LIBRARIES Qt::CorePrivate + TESTDATA ${test_data} ) # Resources: -add_qt_resource(tst_qdiriterator "qdiriterator" PREFIX "/testdata/" FILES - entrylist/directory/dummy - entrylist/file) - +add_qt_resource(tst_qdiriterator "qdiriterator" + PREFIX + "/testdata/" + FILES + "entrylist/directory/dummy" + "entrylist/file" +) -#### Keys ignored in scope 1:.:.:qdiriterator.pro:: -# CONFIG = "testcase" -# TESTDATA = "entrylist" ## Scopes: ##################################################################### diff --git a/tests/auto/corelib/io/qfile/.prev_CMakeLists.txt b/tests/auto/corelib/io/qfile/.prev_CMakeLists.txt new file mode 100644 index 0000000000..57824a82c7 --- /dev/null +++ b/tests/auto/corelib/io/qfile/.prev_CMakeLists.txt @@ -0,0 +1,78 @@ +# Generated from qfile.pro. + +##################################################################### +## tst_qfile Test: +##################################################################### + +# Collect test data +list(APPEND test_data "BLACKLIST") +list(APPEND test_data "dosfile.txt") +list(APPEND test_data "noendofline.txt") +list(APPEND test_data "testfile.txt") +list(APPEND test_data "testlog.txt") +list(APPEND test_data "two.dots.file") +list(APPEND test_data "tst_qfile.cpp") +list(APPEND test_data "Makefile") +list(APPEND test_data "forCopying.txt") +list(APPEND test_data "forRenaming.txt") +list(APPEND test_data "resources/file1.ext1") + +add_qt_test(tst_qfile + GUI + SOURCES + ../../../../shared/emulationdetector.h + tst_qfile.cpp + INCLUDE_DIRECTORIES + ../../../../shared + LIBRARIES + Qt::CorePrivate + TESTDATA ${test_data} +) + +# Resources: +add_qt_resource(tst_qfile "qfile" + PREFIX + "/tst_qfileinfo/" + FILES + "resources/" +) +add_qt_resource(tst_qfile "rename-fallback" + PREFIX + "/" + FILES + "rename-fallback.qrc" +) +add_qt_resource(tst_qfile "copy-fallback" + PREFIX + "/" + FILES + "copy-fallback.qrc" +) + + +## Scopes: +##################################################################### + +extend_target(tst_qfile CONDITION TARGET Qt::Network + PUBLIC_LIBRARIES + Qt::Network +) + +extend_target(tst_qfile CONDITION NOT TARGET Qt::Network + DEFINES + QT_NO_NETWORK +) + +extend_target(tst_qfile CONDITION CONFIG___contains___builtin_testdata + DEFINES + BUILTIN_TESTDATA +) + +extend_target(tst_qfile CONDITION WIN32 AND NOT WINRT + PUBLIC_LIBRARIES + ole32 + uuid +) +if(NOT WINRT) + add_subdirectory(stdinprocess) +endif() diff --git a/tests/auto/corelib/io/qfile/CMakeLists.txt b/tests/auto/corelib/io/qfile/CMakeLists.txt index dcc9c85f5d..d4fd6e48cf 100644 --- a/tests/auto/corelib/io/qfile/CMakeLists.txt +++ b/tests/auto/corelib/io/qfile/CMakeLists.txt @@ -4,7 +4,21 @@ ## tst_qfile Test: ##################################################################### +# Collect test data +list(APPEND test_data "BLACKLIST") +list(APPEND test_data "dosfile.txt") +list(APPEND test_data "noendofline.txt") +list(APPEND test_data "testfile.txt") +list(APPEND test_data "testlog.txt") +list(APPEND test_data "two.dots.file") +list(APPEND test_data "tst_qfile.cpp") +# list(APPEND test_data "Makefile") # special case remove +list(APPEND test_data "forCopying.txt") +list(APPEND test_data "forRenaming.txt") +list(APPEND test_data "resources/file1.ext1") + add_qt_test(tst_qfile + GUI SOURCES ../../../../shared/emulationdetector.h tst_qfile.cpp @@ -12,20 +26,29 @@ add_qt_test(tst_qfile ../../../../shared LIBRARIES Qt::CorePrivate + TESTDATA ${test_data} ) # Resources: -add_qt_resource(tst_qfile "qfile" PREFIX "/tst_qfileinfo/" FILES - resources/) -add_qt_resource(tst_qfile "rename-fallback" FILES - rename-fallback.qrc) -add_qt_resource(tst_qfile "copy-fallback" FILES - copy-fallback.qrc) - +add_qt_resource(tst_qfile "qfile" + PREFIX + "/tst_qfileinfo/" + FILES + "resources/" +) +add_qt_resource(tst_qfile "rename-fallback" + PREFIX + "/" + FILES + "rename-fallback.qrc" +) +add_qt_resource(tst_qfile "copy-fallback" + PREFIX + "/" + FILES + "copy-fallback.qrc" +) -#### Keys ignored in scope 3:.:.:test.pro:: -# CONFIG = "testcase" -# TESTDATA = "BLACKLIST" "dosfile.txt" "noendofline.txt" "testfile.txt" "testlog.txt" "two.dots.file" "tst_qfile.cpp" "Makefile" "forCopying.txt" "forRenaming.txt" "resources/file1.ext1" ## Scopes: ##################################################################### @@ -35,7 +58,7 @@ extend_target(tst_qfile CONDITION TARGET Qt::Network Qt::Network ) -extend_target(tst_qfile CONDITION NOT (TARGET Qt::Network) +extend_target(tst_qfile CONDITION NOT TARGET Qt::Network DEFINES QT_NO_NETWORK ) @@ -50,7 +73,6 @@ extend_target(tst_qfile CONDITION WIN32 AND NOT WINRT ole32 uuid ) - if(NOT WINRT) add_subdirectory(stdinprocess) endif() diff --git a/tests/auto/corelib/io/qfile/stdinprocess/CMakeLists.txt b/tests/auto/corelib/io/qfile/stdinprocess/CMakeLists.txt index 508e16ecc4..9f12295c9d 100644 --- a/tests/auto/corelib/io/qfile/stdinprocess/CMakeLists.txt +++ b/tests/auto/corelib/io/qfile/stdinprocess/CMakeLists.txt @@ -1,11 +1,10 @@ # Generated from stdinprocess.pro. ##################################################################### -## stdinprocess Binary: +## stdinprocess_helper Binary: ##################################################################### -add_qt_executable(stdinprocess - GUI +add_qt_test_helper(stdinprocess_helper SOURCES main.cpp ) diff --git a/tests/auto/corelib/io/qfileinfo/CMakeLists.txt b/tests/auto/corelib/io/qfileinfo/CMakeLists.txt index 58ef56d31e..d786378b61 100644 --- a/tests/auto/corelib/io/qfileinfo/CMakeLists.txt +++ b/tests/auto/corelib/io/qfileinfo/CMakeLists.txt @@ -5,6 +5,7 @@ ##################################################################### add_qt_test(tst_qfileinfo + GUI SOURCES tst_qfileinfo.cpp LIBRARIES @@ -12,17 +13,22 @@ add_qt_test(tst_qfileinfo ) # Resources: -add_qt_resource(tst_qfileinfo "qfileinfo" PREFIX "/tst_qfileinfo/" FILES - resources/) -add_qt_resource(tst_qfileinfo "testdata" PREFIX "/testdata" FILES - resources/file1 - resources/file1.ext1 - resources/file1.ext1.ext2 - tst_qfileinfo.cpp) - +add_qt_resource(tst_qfileinfo "qfileinfo" + PREFIX + "/tst_qfileinfo/" + FILES + "resources/" +) +add_qt_resource(tst_qfileinfo "testdata" + PREFIX + "/testdata" + FILES + "resources/file1" + "resources/file1.ext1" + "resources/file1.ext1.ext2" + "tst_qfileinfo.cpp" +) -#### Keys ignored in scope 1:.:.:qfileinfo.pro:: -# CONFIG = "testcase" ## Scopes: ##################################################################### diff --git a/tests/auto/corelib/io/qfileselector/CMakeLists.txt b/tests/auto/corelib/io/qfileselector/CMakeLists.txt deleted file mode 100644 index d7f0b539b6..0000000000 --- a/tests/auto/corelib/io/qfileselector/CMakeLists.txt +++ /dev/null @@ -1,66 +0,0 @@ -# Generated from qfileselector.pro. - -##################################################################### -## tst_qfileselectors Test: -##################################################################### - -add_qt_test(tst_qfileselectors - SOURCES - tst_qfileselector.cpp - LIBRARIES - Qt::CorePrivate -) - -# Resources: -add_qt_resource(tst_qfileselectors "qfileselector" PREFIX "/" FILES - extras/+custom1/test - extras/+custom1/test3 - extras/+custom2/test - extras/+custom3/+custom2/test - extras/+custom3/+custom4/test - extras/+custom3/+custom5/test - extras/+custom3/test - extras/+custom5/+custom3/test - extras/test - extras/test2 - platforms/+android/test - platforms/+android/test2 - platforms/+darwin/test - platforms/+haiku/test - platforms/+haiku/test2 - platforms/+ios/test - platforms/+ios/test2 - platforms/+linux/test - platforms/+linux/test2 - platforms/+macos/test - platforms/+macos/test2 - platforms/+qnx/test - platforms/+qnx/test2 - platforms/+unix/+android/test - platforms/+unix/+darwin/+ios/test - platforms/+unix/+darwin/+macos/test - platforms/+unix/+darwin/test - platforms/+unix/+haiku/test - platforms/+unix/+linux/test - platforms/+unix/+qnx/test - platforms/+unix/test - platforms/+unix/test3 - platforms/+wince/test - platforms/+wince/test2 - platforms/+windows/+wince/test - platforms/+windows/+winnt/test - platforms/+windows/+winrt/test - platforms/+windows/test - platforms/+windows/test3 - platforms/+winnt/test2 - platforms/+winrt/test - platforms/+winrt/test2 - platforms/test - platforms/test2 - platforms/test3 - platforms/test4 - platforms/test5) - - -#### Keys ignored in scope 1:.:.:qfileselector.pro:: -# CONFIG = "testcase" diff --git a/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt b/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt index a07a6c2414..fd56528cb2 100644 --- a/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt +++ b/tests/auto/corelib/io/qfilesystementry/CMakeLists.txt @@ -12,6 +12,3 @@ add_qt_test(tst_qfilesystementry LIBRARIES Qt::CorePrivate ) - -#### Keys ignored in scope 1:.:.:qfilesystementry.pro:: -# CONFIG = "testcase" diff --git a/tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt b/tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt index bf9eba566d..a6ded42656 100644 --- a/tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt +++ b/tests/auto/corelib/io/qfilesystemmetadata/CMakeLists.txt @@ -5,11 +5,9 @@ ##################################################################### add_qt_test(tst_qfilesystemmetadata + GUI SOURCES tst_qfilesystemmetadata.cpp LIBRARIES Qt::CorePrivate ) - -#### Keys ignored in scope 1:.:.:qfilesystemmetadata.pro:: -# CONFIG = "testcase" "parallel_test" diff --git a/tests/auto/corelib/io/qfilesystemwatcher/CMakeLists.txt b/tests/auto/corelib/io/qfilesystemwatcher/CMakeLists.txt index 978f87acab..3230a22a24 100644 --- a/tests/auto/corelib/io/qfilesystemwatcher/CMakeLists.txt +++ b/tests/auto/corelib/io/qfilesystemwatcher/CMakeLists.txt @@ -1 +1,11 @@ -add_qt_test(tst_qfilesystemwatcher SOURCES tst_qfilesystemwatcher.cpp) +# Generated from qfilesystemwatcher.pro. + +##################################################################### +## tst_qfilesystemwatcher Test: +##################################################################### + +add_qt_test(tst_qfilesystemwatcher + GUI + SOURCES + tst_qfilesystemwatcher.cpp +) diff --git a/tests/auto/corelib/io/qiodevice/CMakeLists.txt b/tests/auto/corelib/io/qiodevice/CMakeLists.txt index d47a72241a..c33870a9c6 100644 --- a/tests/auto/corelib/io/qiodevice/CMakeLists.txt +++ b/tests/auto/corelib/io/qiodevice/CMakeLists.txt @@ -4,22 +4,29 @@ ## tst_qiodevice Test: ##################################################################### +# Collect test data +list(APPEND test_data "tst_qiodevice.cpp") + add_qt_test(tst_qiodevice + GUI SOURCES tst_qiodevice.cpp PUBLIC_LIBRARIES Qt::Network + TESTDATA ${test_data} ) #### Keys ignored in scope 1:.:.:qiodevice.pro:: -# CONFIG = "testcase" # MOC_DIR = "tmp" -# TESTDATA = "tst_qiodevice.cpp" ## Scopes: ##################################################################### # Resources: -add_qt_resource(tst_qiodevice "android_testdata" PREFIX "/" FILES - tst_qiodevice.cpp) +add_qt_resource(tst_qiodevice "android_testdata" + PREFIX + "/" + FILES + "tst_qiodevice.cpp" +) diff --git a/tests/auto/corelib/io/qipaddress/CMakeLists.txt b/tests/auto/corelib/io/qipaddress/CMakeLists.txt index c60bae1c21..dd44c92cb7 100644 --- a/tests/auto/corelib/io/qipaddress/CMakeLists.txt +++ b/tests/auto/corelib/io/qipaddress/CMakeLists.txt @@ -1 +1,13 @@ -add_qt_test(tst_qipaddress SOURCES tst_qipaddress.cpp LIBRARIES Qt::CorePrivate) +# Generated from qipaddress.pro. + +##################################################################### +## tst_qipaddress Test: +##################################################################### + +add_qt_test(tst_qipaddress + GUI + SOURCES + tst_qipaddress.cpp + LIBRARIES + Qt::CorePrivate +) diff --git a/tests/auto/corelib/io/qlockfile/CMakeLists.txt b/tests/auto/corelib/io/qlockfile/CMakeLists.txt new file mode 100644 index 0000000000..5ab39c57a2 --- /dev/null +++ b/tests/auto/corelib/io/qlockfile/CMakeLists.txt @@ -0,0 +1,24 @@ +# Generated from qlockfile.pro. + +##################################################################### +## tst_qlockfile Test: +##################################################################### + +add_qt_test(tst_qlockfile + GUI + SOURCES + tst_qlockfile.cpp + LIBRARIES + Qt::CorePrivate + PUBLIC_LIBRARIES + Qt::Concurrent +) + +## Scopes: +##################################################################### + +extend_target(tst_qlockfile CONDITION WIN32 AND NOT WINRT + PUBLIC_LIBRARIES + advapi32 +) +add_subdirectory(qlockfiletesthelper) diff --git a/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/.prev_CMakeLists.txt b/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/.prev_CMakeLists.txt new file mode 100644 index 0000000000..7d78a407e2 --- /dev/null +++ b/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/.prev_CMakeLists.txt @@ -0,0 +1,11 @@ +# Generated from qlockfile_test_helper.pro. + +##################################################################### +## qlockfile_test_helper Binary: +##################################################################### + +add_qt_executable(qlockfile_test_helper + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/./" + SOURCES + qlockfile_test_helper.cpp +) diff --git a/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/CMakeLists.txt b/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/CMakeLists.txt new file mode 100644 index 0000000000..bb6bc78b77 --- /dev/null +++ b/tests/auto/corelib/io/qlockfile/qlockfiletesthelper/CMakeLists.txt @@ -0,0 +1,12 @@ +# Generated from qlockfile_test_helper.pro. + +##################################################################### +## qlockfile_test_helper Binary: +##################################################################### + +add_qt_test_helper(qlockfile_test_helper # special case + OVERRIDE_OUTPUT_DIRECTORY # special case + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/./" + SOURCES + qlockfile_test_helper.cpp +) diff --git a/tests/auto/corelib/io/qloggingcategory/CMakeLists.txt b/tests/auto/corelib/io/qloggingcategory/CMakeLists.txt index 00b807eeba..dc74cbcedf 100644 --- a/tests/auto/corelib/io/qloggingcategory/CMakeLists.txt +++ b/tests/auto/corelib/io/qloggingcategory/CMakeLists.txt @@ -1 +1,16 @@ -add_qt_test(tst_qloggingcategory SOURCES tst_qloggingcategory.cpp LIBRARIES Qt::CorePrivate) +# Generated from qloggingcategory.pro. + +##################################################################### +## tst_qloggingcategory Test: +##################################################################### + +add_qt_test(tst_qloggingcategory + GUI + SOURCES + tst_qloggingcategory.cpp + LIBRARIES + Qt::CorePrivate +) + +#### Keys ignored in scope 1:.:.:qloggingcategory.pro:: +# TEMPLATE = "app" diff --git a/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt b/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt index a2ef7bd3ad..fb70256218 100644 --- a/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt +++ b/tests/auto/corelib/io/qloggingregistry/CMakeLists.txt @@ -4,22 +4,29 @@ ## tst_qloggingregistry Test: ##################################################################### +# Collect test data +list(APPEND test_data "qtlogging.ini") + add_qt_test(tst_qloggingregistry + GUI SOURCES tst_qloggingregistry.cpp LIBRARIES Qt::CorePrivate + TESTDATA ${test_data} ) #### Keys ignored in scope 1:.:.:qloggingregistry.pro:: -# CONFIG = "testcase" # TEMPLATE = "app" -# TESTDATA = "qtlogging.ini" ## Scopes: ##################################################################### # Resources: -add_qt_resource(tst_qloggingregistry "android_testdata" PREFIX "/" FILES - qtlogging.ini) +add_qt_resource(tst_qloggingregistry "android_testdata" + PREFIX + "/" + FILES + "qtlogging.ini" +) diff --git a/tests/auto/corelib/io/qnodebug/CMakeLists.txt b/tests/auto/corelib/io/qnodebug/CMakeLists.txt index 15e46596f4..741f9d3ce4 100644 --- a/tests/auto/corelib/io/qnodebug/CMakeLists.txt +++ b/tests/auto/corelib/io/qnodebug/CMakeLists.txt @@ -1 +1,11 @@ -add_qt_test(tst_qnodebug SOURCES tst_qnodebug.cpp) +# Generated from qnodebug.pro. + +##################################################################### +## tst_qnodebug Test: +##################################################################### + +add_qt_test(tst_qnodebug + GUI + SOURCES + tst_qnodebug.cpp +) diff --git a/tests/auto/corelib/io/qprocess-noapplication/CMakeLists.txt b/tests/auto/corelib/io/qprocess-noapplication/CMakeLists.txt new file mode 100644 index 0000000000..ec2b6bf264 --- /dev/null +++ b/tests/auto/corelib/io/qprocess-noapplication/CMakeLists.txt @@ -0,0 +1,11 @@ +# Generated from qprocess-noapplication.pro. + +##################################################################### +## qprocess-noapplication Test: +##################################################################### + +add_qt_test(qprocess-noapplication + GUI + SOURCES + tst_qprocessnoapplication.cpp +) diff --git a/tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt b/tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt index 68c6a9936f..eb56b30ac3 100644 --- a/tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt +++ b/tests/auto/corelib/io/qprocessenvironment/CMakeLists.txt @@ -1 +1,11 @@ -add_qt_test(tst_qprocessenvironment SOURCES tst_qprocessenvironment.cpp) +# Generated from qprocessenvironment.pro. + +##################################################################### +## tst_qprocessenvironment Test: +##################################################################### + +add_qt_test(tst_qprocessenvironment + GUI + SOURCES + tst_qprocessenvironment.cpp +) diff --git a/tests/auto/corelib/io/qsavefile/CMakeLists.txt b/tests/auto/corelib/io/qsavefile/CMakeLists.txt index c22fe475dd..42f1ae3d46 100644 --- a/tests/auto/corelib/io/qsavefile/CMakeLists.txt +++ b/tests/auto/corelib/io/qsavefile/CMakeLists.txt @@ -4,11 +4,12 @@ ## tst_qsavefile Test: ##################################################################### +# Collect test data +list(APPEND test_data "tst_qsavefile.cpp") + add_qt_test(tst_qsavefile + GUI SOURCES tst_qsavefile.cpp + TESTDATA ${test_data} ) - -#### Keys ignored in scope 1:.:.:qsavefile.pro:: -# CONFIG = "testcase" -# TESTDATA = "tst_qsavefile.cpp" diff --git a/tests/auto/corelib/io/qsettings/CMakeLists.txt b/tests/auto/corelib/io/qsettings/CMakeLists.txt index 8634169d4d..4011a13a58 100644 --- a/tests/auto/corelib/io/qsettings/CMakeLists.txt +++ b/tests/auto/corelib/io/qsettings/CMakeLists.txt @@ -5,6 +5,7 @@ ##################################################################### add_qt_test(tst_qsettings + GUI SOURCES tst_qsettings.cpp DEFINES @@ -18,19 +19,20 @@ add_qt_test(tst_qsettings ) # Resources: -add_qt_resource(tst_qsettings "qsettings" PREFIX "/" FILES - bom.ini - resourcefile.ini - resourcefile2.ini - resourcefile3.ini - resourcefile4.ini - resourcefile5.ini - resourcefile6.plist - withcomments.ini) - +add_qt_resource(tst_qsettings "qsettings" + PREFIX + "/" + FILES + "bom.ini" + "resourcefile.ini" + "resourcefile2.ini" + "resourcefile3.ini" + "resourcefile4.ini" + "resourcefile5.ini" + "resourcefile6.plist" + "withcomments.ini" +) -#### Keys ignored in scope 1:.:.:qsettings.pro:: -# CONFIG = "testcase" ## Scopes: ##################################################################### diff --git a/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt b/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt index a98c65cb44..89b5af5302 100644 --- a/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt +++ b/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt @@ -4,18 +4,20 @@ ## tst_qstandardpaths Test: ##################################################################### +# Collect test data +list(APPEND test_data "tst_qstandardpaths.cpp") +list(APPEND test_data "qstandardpaths.pro") + add_qt_test(tst_qstandardpaths + GUI SOURCES ../../../../shared/emulationdetector.h tst_qstandardpaths.cpp INCLUDE_DIRECTORIES ../../../../shared + TESTDATA ${test_data} ) -#### Keys ignored in scope 1:.:.:qstandardpaths.pro:: -# CONFIG = "testcase" -# TESTDATA = "tst_qstandardpaths.cpp" "qstandardpaths.pro" - ## Scopes: ##################################################################### diff --git a/tests/auto/corelib/io/qstorageinfo/CMakeLists.txt b/tests/auto/corelib/io/qstorageinfo/CMakeLists.txt index 16e4415bc5..2c4db5e829 100644 --- a/tests/auto/corelib/io/qstorageinfo/CMakeLists.txt +++ b/tests/auto/corelib/io/qstorageinfo/CMakeLists.txt @@ -1 +1,13 @@ -add_qt_test(tst_qstorageinfo SOURCES tst_qstorageinfo.cpp LIBRARIES Qt::CorePrivate) +# Generated from qstorageinfo.pro. + +##################################################################### +## tst_qstorageinfo Test: +##################################################################### + +add_qt_test(tst_qstorageinfo + GUI + SOURCES + tst_qstorageinfo.cpp + LIBRARIES + Qt::CorePrivate +) diff --git a/tests/auto/corelib/io/qtemporarydir/CMakeLists.txt b/tests/auto/corelib/io/qtemporarydir/CMakeLists.txt index 7f1957df7f..bd8f8140b6 100644 --- a/tests/auto/corelib/io/qtemporarydir/CMakeLists.txt +++ b/tests/auto/corelib/io/qtemporarydir/CMakeLists.txt @@ -5,6 +5,7 @@ ##################################################################### add_qt_test(tst_qtemporarydir + GUI SOURCES ../../../../shared/emulationdetector.h tst_qtemporarydir.cpp @@ -13,6 +14,3 @@ add_qt_test(tst_qtemporarydir LIBRARIES Qt::TestPrivate ) - -#### Keys ignored in scope 1:.:.:qtemporarydir.pro:: -# CONFIG = "testcase" diff --git a/tests/auto/corelib/io/qtemporaryfile/CMakeLists.txt b/tests/auto/corelib/io/qtemporaryfile/CMakeLists.txt index 7acf70fd36..b1c324ca17 100644 --- a/tests/auto/corelib/io/qtemporaryfile/CMakeLists.txt +++ b/tests/auto/corelib/io/qtemporaryfile/CMakeLists.txt @@ -4,27 +4,36 @@ ## tst_qtemporaryfile Test: ##################################################################### +# Collect test data +list(APPEND test_data "tst_qtemporaryfile.cpp") + add_qt_test(tst_qtemporaryfile + GUI SOURCES tst_qtemporaryfile.cpp LIBRARIES Qt::TestPrivate + TESTDATA ${test_data} ) # Resources: -add_qt_resource(tst_qtemporaryfile "qtemporaryfile" FILES - resources/test.txt) - +add_qt_resource(tst_qtemporaryfile "qtemporaryfile" + PREFIX + "/" + FILES + "resources/test.txt" +) -#### Keys ignored in scope 1:.:.:qtemporaryfile.pro:: -# CONFIG = "testcase" -# TESTDATA = "tst_qtemporaryfile.cpp" ## Scopes: ##################################################################### # Resources: -add_qt_resource(tst_qtemporaryfile "android_testdata" PREFIX "/android_testdata" FILES - resources/test.txt - tst_qtemporaryfile.cpp) +add_qt_resource(tst_qtemporaryfile "android_testdata" + PREFIX + "/android_testdata" + FILES + "resources/test.txt" + "tst_qtemporaryfile.cpp" +) diff --git a/tests/auto/corelib/io/qurl/CMakeLists.txt b/tests/auto/corelib/io/qurl/CMakeLists.txt index 2807baabf5..a1b60a1751 100644 --- a/tests/auto/corelib/io/qurl/CMakeLists.txt +++ b/tests/auto/corelib/io/qurl/CMakeLists.txt @@ -5,19 +5,17 @@ ##################################################################### add_qt_test(tst_qurl + GUI SOURCES tst_qurl.cpp PUBLIC_LIBRARIES Qt::Concurrent ) -#### Keys ignored in scope 1:.:.:qurl.pro:: -# CONFIG = "testcase" - ## Scopes: ##################################################################### -extend_target(tst_qurl CONDITION APPLE_OSX +extend_target(tst_qurl CONDITION APPLE SOURCES tst_qurl_mac.mm ) diff --git a/tests/auto/corelib/io/qurlinternal/CMakeLists.txt b/tests/auto/corelib/io/qurlinternal/CMakeLists.txt index 1953d75f7b..21e661a17f 100644 --- a/tests/auto/corelib/io/qurlinternal/CMakeLists.txt +++ b/tests/auto/corelib/io/qurlinternal/CMakeLists.txt @@ -5,12 +5,10 @@ ##################################################################### add_qt_test(tst_qurlinternal + GUI SOURCES ../../codecs/utf8/utf8data.cpp tst_qurlinternal.cpp LIBRARIES Qt::CorePrivate ) - -#### Keys ignored in scope 1:.:.:qurlinternal.pro:: -# CONFIG = "testcase" diff --git a/tests/auto/corelib/io/qurlquery/CMakeLists.txt b/tests/auto/corelib/io/qurlquery/CMakeLists.txt index 88fd621720..0e82c3812c 100644 --- a/tests/auto/corelib/io/qurlquery/CMakeLists.txt +++ b/tests/auto/corelib/io/qurlquery/CMakeLists.txt @@ -1 +1,15 @@ -add_qt_test(tst_qurlquery SOURCES tst_qurlquery.cpp LIBRARIES Qt::CorePrivate) +# Generated from qurlquery.pro. + +##################################################################### +## tst_qurlquery Test: +##################################################################### + +add_qt_test(tst_qurlquery + GUI + SOURCES + tst_qurlquery.cpp + DEFINES + SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\" + LIBRARIES + Qt::CorePrivate +) -- cgit v1.2.3