diff options
author | Mikhail Svetkin <mikhail.svetkin@gmail.com> | 2020-04-09 11:18:07 +0200 |
---|---|---|
committer | Mikhail Svetkin <mikhail.svetkin@gmail.com> | 2020-05-05 19:43:56 +0200 |
commit | 4b2790aa6d61790c291d4744d77732db7cccc752 (patch) | |
tree | 9267fd92950c3f8882e24dd5d40f4186c2e4b282 /tests | |
parent | 6d0a9b6f834c097bc79de75d1684a26291b08098 (diff) |
Add cmake support for Qt6/dev branch
Change-Id: Icca0edab01d6028d786b76f99fba388565bd6e76
Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/CMakeLists.txt | 7 | ||||
-rw-r--r-- | tests/auto/CMakeLists.txt | 7 | ||||
-rw-r--r-- | tests/auto/qabstracthttpserver/CMakeLists.txt | 12 | ||||
-rw-r--r-- | tests/auto/qabstracthttpserver/qabstracthttpserver.pro | 2 | ||||
-rw-r--r-- | tests/auto/qabstracthttpserver/tst_qabstracthttpserver.cpp | 6 | ||||
-rw-r--r-- | tests/auto/qhttpserver/CMakeLists.txt | 17 | ||||
-rw-r--r-- | tests/auto/qhttpserverresponder/CMakeLists.txt | 17 | ||||
-rw-r--r-- | tests/auto/qhttpserverresponder/data/index.html (renamed from tests/auto/qhttpserverresponder/index.html) | 0 | ||||
-rw-r--r-- | tests/auto/qhttpserverresponder/qhttpserverresponder.pro | 2 | ||||
-rw-r--r-- | tests/auto/qhttpserverresponder/tst_qhttpserverresponder.cpp | 4 | ||||
-rw-r--r-- | tests/auto/qhttpserverresponse/CMakeLists.txt | 17 | ||||
-rw-r--r-- | tests/auto/qhttpserverrouter/CMakeLists.txt | 12 |
12 files changed, 95 insertions, 8 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt new file mode 100644 index 0000000..2214137 --- /dev/null +++ b/tests/CMakeLists.txt @@ -0,0 +1,7 @@ +# Generated from tests.pro. + +if(QT_BUILD_STANDALONE_TESTS) + # Add qt_find_package calls for extra dependencies that need to be found when building + # the standalone tests here. +endif() +qt_build_tests() diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt new file mode 100644 index 0000000..a7e0cb5 --- /dev/null +++ b/tests/auto/CMakeLists.txt @@ -0,0 +1,7 @@ +# Generated from auto.pro. + +add_subdirectory(qabstracthttpserver) +add_subdirectory(qhttpserver) +add_subdirectory(qhttpserverresponder) +add_subdirectory(qhttpserverrouter) +add_subdirectory(qhttpserverresponse) diff --git a/tests/auto/qabstracthttpserver/CMakeLists.txt b/tests/auto/qabstracthttpserver/CMakeLists.txt new file mode 100644 index 0000000..f7de801 --- /dev/null +++ b/tests/auto/qabstracthttpserver/CMakeLists.txt @@ -0,0 +1,12 @@ +# Generated from qabstracthttpserver.pro. + +##################################################################### +## tst_qabstracthttpserver Test: +##################################################################### + +qt_add_test(tst_qabstracthttpserver + SOURCES + tst_qabstracthttpserver.cpp + PUBLIC_LIBRARIES + Qt::HttpServer +) diff --git a/tests/auto/qabstracthttpserver/qabstracthttpserver.pro b/tests/auto/qabstracthttpserver/qabstracthttpserver.pro index ae089bf..ca20055 100644 --- a/tests/auto/qabstracthttpserver/qabstracthttpserver.pro +++ b/tests/auto/qabstracthttpserver/qabstracthttpserver.pro @@ -3,5 +3,3 @@ TARGET = tst_qabstracthttpserver SOURCES += tst_qabstracthttpserver.cpp QT = httpserver testlib - -qtHaveModule(websockets): QT += websockets diff --git a/tests/auto/qabstracthttpserver/tst_qabstracthttpserver.cpp b/tests/auto/qabstracthttpserver/tst_qabstracthttpserver.cpp index d8dc0ef..48c637c 100644 --- a/tests/auto/qabstracthttpserver/tst_qabstracthttpserver.cpp +++ b/tests/auto/qabstracthttpserver/tst_qabstracthttpserver.cpp @@ -30,7 +30,7 @@ #include <QtHttpServer/qabstracthttpserver.h> #if defined(QT_WEBSOCKETS_LIB) -#include <QtWebSockets/qwebsocket.h> +# include <QtWebSockets/qwebsocket.h> #endif #include <QtTest/qsignalspy.h> @@ -45,8 +45,8 @@ #include <QtHttpServer/qhttpserverrequest.h> #if defined(Q_OS_UNIX) -# include <signal.h> -# include <unistd.h> +# include <signal.h> +# include <unistd.h> #endif QT_BEGIN_NAMESPACE diff --git a/tests/auto/qhttpserver/CMakeLists.txt b/tests/auto/qhttpserver/CMakeLists.txt new file mode 100644 index 0000000..806494e --- /dev/null +++ b/tests/auto/qhttpserver/CMakeLists.txt @@ -0,0 +1,17 @@ +# Generated from qhttpserver.pro. + +##################################################################### +## tst_qhttpserver Test: +##################################################################### + +# Collect test data +list(APPEND test_data "data/") + +qt_add_test(tst_qhttpserver + SOURCES + tst_qhttpserver.cpp + PUBLIC_LIBRARIES + Qt::HttpServer + Qt::HttpServerPrivate + TESTDATA ${test_data} +) diff --git a/tests/auto/qhttpserverresponder/CMakeLists.txt b/tests/auto/qhttpserverresponder/CMakeLists.txt new file mode 100644 index 0000000..51a2a33 --- /dev/null +++ b/tests/auto/qhttpserverresponder/CMakeLists.txt @@ -0,0 +1,17 @@ +# Generated from qhttpserverresponder.pro. + +##################################################################### +## tst_qhttpserverresponder Test: +##################################################################### + +# Collect test data +list(APPEND test_data "data/") + +qt_add_test(tst_qhttpserverresponder + SOURCES + tst_qhttpserverresponder.cpp + PUBLIC_LIBRARIES + Qt::HttpServer + Qt::HttpServerPrivate + TESTDATA ${test_data} +) diff --git a/tests/auto/qhttpserverresponder/index.html b/tests/auto/qhttpserverresponder/data/index.html index 18ecdcb..18ecdcb 100644 --- a/tests/auto/qhttpserverresponder/index.html +++ b/tests/auto/qhttpserverresponder/data/index.html diff --git a/tests/auto/qhttpserverresponder/qhttpserverresponder.pro b/tests/auto/qhttpserverresponder/qhttpserverresponder.pro index e3031db..c170060 100644 --- a/tests/auto/qhttpserverresponder/qhttpserverresponder.pro +++ b/tests/auto/qhttpserverresponder/qhttpserverresponder.pro @@ -4,4 +4,4 @@ SOURCES += tst_qhttpserverresponder.cpp QT = httpserver httpserver-private testlib -TESTDATA += *.html +TESTDATA += data/ diff --git a/tests/auto/qhttpserverresponder/tst_qhttpserverresponder.cpp b/tests/auto/qhttpserverresponder/tst_qhttpserverresponder.cpp index b6dd81f..20b9480 100644 --- a/tests/auto/qhttpserverresponder/tst_qhttpserverresponder.cpp +++ b/tests/auto/qhttpserverresponder/tst_qhttpserverresponder.cpp @@ -189,7 +189,7 @@ void tst_QHttpServerResponder::writeFile_data() QTest::addColumn<QString>("data"); QTest::addRow("index.html") - << qobject_cast<QIODevice *>(new QFile(QFINDTESTDATA("index.html"), this)) + << qobject_cast<QIODevice *>(new QFile(QFINDTESTDATA("data/index.html"), this)) << 200 << "text/html" << "<html></html>"; @@ -231,7 +231,7 @@ void tst_QHttpServerResponder::writeFile() void tst_QHttpServerResponder::writeFileExtraHeader() { - auto file = new QFile(QFINDTESTDATA("index.html"), this); + auto file = new QFile(QFINDTESTDATA("data/index.html"), this); QSignalSpy spyDestroyIoDevice(file, &QObject::destroyed); HttpServer server([=](QHttpServerResponder responder) { diff --git a/tests/auto/qhttpserverresponse/CMakeLists.txt b/tests/auto/qhttpserverresponse/CMakeLists.txt new file mode 100644 index 0000000..7ab6d6c --- /dev/null +++ b/tests/auto/qhttpserverresponse/CMakeLists.txt @@ -0,0 +1,17 @@ +# Generated from qhttpserverresponse.pro. + +##################################################################### +## tst_qhttpserverresponse Test: +##################################################################### + +# Collect test data +list(APPEND test_data "data/") + +qt_add_test(tst_qhttpserverresponse + SOURCES + tst_qhttpserverresponse.cpp + PUBLIC_LIBRARIES + Qt::HttpServer + Qt::HttpServerPrivate + TESTDATA ${test_data} +) diff --git a/tests/auto/qhttpserverrouter/CMakeLists.txt b/tests/auto/qhttpserverrouter/CMakeLists.txt new file mode 100644 index 0000000..27901fc --- /dev/null +++ b/tests/auto/qhttpserverrouter/CMakeLists.txt @@ -0,0 +1,12 @@ +# Generated from qhttpserverrouter.pro. + +##################################################################### +## tst_qhttpserverrouter Test: +##################################################################### + +qt_add_test(tst_qhttpserverrouter + SOURCES + tst_qhttpserverrouter.cpp + PUBLIC_LIBRARIES + Qt::HttpServer +) |