aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2022-01-03 10:32:13 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-01-03 14:27:32 +0000
commit31b253edf99a538c58d0006b47c99830891c8a5a (patch)
treec5c526b25928c912410116de9f80c68f045000e3 /tests
parent7f731838b0d521c002edbaef0a093d46ab80a416 (diff)
qmlls: Rename lifecycle test
We have another target called tst_qlanguageserver which breaks in top-level builds. The test in qtdeclarative doesn't actually test the base language server but only the life cycle methods added for the QML language server. Change-Id: I4cf6f038289c962b1fe1434d5c3e68ec7c1d3b95 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 7f3d8fc7eb41b6192c07b5faea5939bc33d1a1e9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qmlls/CMakeLists.txt2
-rw-r--r--tests/auto/qmlls/lifecycle/CMakeLists.txt (renamed from tests/auto/qmlls/qlanguageserver/CMakeLists.txt)6
-rw-r--r--tests/auto/qmlls/lifecycle/qiopipe.cpp (renamed from tests/auto/qmlls/qlanguageserver/qiopipe.cpp)0
-rw-r--r--tests/auto/qmlls/lifecycle/qiopipe.h (renamed from tests/auto/qmlls/qlanguageserver/qiopipe.h)0
-rw-r--r--tests/auto/qmlls/lifecycle/tst_lifecycle.cpp (renamed from tests/auto/qmlls/qlanguageserver/tst_qlanguageserver.cpp)8
5 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/qmlls/CMakeLists.txt b/tests/auto/qmlls/CMakeLists.txt
index 2ce7460b80..9366aaad63 100644
--- a/tests/auto/qmlls/CMakeLists.txt
+++ b/tests/auto/qmlls/CMakeLists.txt
@@ -1,4 +1,4 @@
if (TARGET Qt::LanguageServerPrivate)
add_subdirectory(qmlls)
- add_subdirectory(qlanguageserver)
+ add_subdirectory(lifecycle)
endif()
diff --git a/tests/auto/qmlls/qlanguageserver/CMakeLists.txt b/tests/auto/qmlls/lifecycle/CMakeLists.txt
index 8ab6c0902e..a8b282a030 100644
--- a/tests/auto/qmlls/qlanguageserver/CMakeLists.txt
+++ b/tests/auto/qmlls/lifecycle/CMakeLists.txt
@@ -1,11 +1,11 @@
#####################################################################
-## tst_qlanguageserver Test:
+## tst_lifecycle Test:
#####################################################################
-qt_internal_add_test(tst_qlanguageserver
+qt_internal_add_test(tst_lifecycle
SOURCES
../../../../tools/qmlls/qlanguageserver.h ../../../../tools/qmlls/qlanguageserver.cpp
- tst_qlanguageserver.cpp
+ tst_lifecycle.cpp
qiopipe.h qiopipe.cpp
INCLUDE_DIRECTORIES
../../../../tools/qmlls
diff --git a/tests/auto/qmlls/qlanguageserver/qiopipe.cpp b/tests/auto/qmlls/lifecycle/qiopipe.cpp
index a4f9b1bb5d..a4f9b1bb5d 100644
--- a/tests/auto/qmlls/qlanguageserver/qiopipe.cpp
+++ b/tests/auto/qmlls/lifecycle/qiopipe.cpp
diff --git a/tests/auto/qmlls/qlanguageserver/qiopipe.h b/tests/auto/qmlls/lifecycle/qiopipe.h
index 3d6a0008f3..3d6a0008f3 100644
--- a/tests/auto/qmlls/qlanguageserver/qiopipe.h
+++ b/tests/auto/qmlls/lifecycle/qiopipe.h
diff --git a/tests/auto/qmlls/qlanguageserver/tst_qlanguageserver.cpp b/tests/auto/qmlls/lifecycle/tst_lifecycle.cpp
index 91d778f8fb..0c7f0183e0 100644
--- a/tests/auto/qmlls/qlanguageserver/tst_qlanguageserver.cpp
+++ b/tests/auto/qmlls/lifecycle/tst_lifecycle.cpp
@@ -67,7 +67,7 @@ private:
bool m_hasExited = false;
};
-class tst_QLanguageServer : public QObject
+class tst_LifeCycle : public QObject
{
Q_OBJECT
@@ -75,7 +75,7 @@ private slots:
void lifecycle();
};
-void tst_QLanguageServer::lifecycle()
+void tst_LifeCycle::lifecycle()
{
QIOPipe pipe;
pipe.open(QIODevice::ReadWrite);
@@ -145,5 +145,5 @@ void tst_QLanguageServer::lifecycle()
QTRY_VERIFY(handler.hasExited());
}
-QTEST_MAIN(tst_QLanguageServer)
-#include <tst_qlanguageserver.moc>
+QTEST_MAIN(tst_LifeCycle)
+#include <tst_lifecycle.moc>