summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Bubke <marco.bubke@theqtcompany.com>2015-05-11 12:30:34 +0200
committerNikolai Kosjar <nikolai.kosjar@theqtcompany.com>2015-05-21 10:08:35 +0000
commit3889693cf759a4edf6d3493867dae2a3c9701d94 (patch)
tree272416b0529609a142c881e2b563c93f22bb3e20
parentc5a0e257884c1d9f26f7242692be46871bbfad6b (diff)
downloadqt-creator-3889693cf759a4edf6d3493867dae2a3c9701d94.tar.gz
Rename test server to echo server
Change-Id: I8b3a963042930f7debf2a12cdde9421f4f820dbd Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
-rw-r--r--tests/unit/codemodelbackend/codemodelbackend.pro4
-rw-r--r--tests/unit/codemodelbackend/echoserver/echoipcserver.cpp (renamed from tests/unit/codemodelbackend/process/echoipcserver.cpp)0
-rw-r--r--tests/unit/codemodelbackend/echoserver/echoipcserver.h (renamed from tests/unit/codemodelbackend/process/echoipcserver.h)0
-rw-r--r--tests/unit/codemodelbackend/echoserver/echoserver.pro (renamed from tests/unit/codemodelbackend/process/process.pro)6
-rw-r--r--tests/unit/codemodelbackend/echoserver/echoserverprocessmain.cpp (renamed from tests/unit/codemodelbackend/process/codemodelbackendserverprocessmain.cpp)0
-rw-r--r--tests/unit/codemodelbackend/unittest/clientserveroutsideprocess.cpp3
6 files changed, 7 insertions, 6 deletions
diff --git a/tests/unit/codemodelbackend/codemodelbackend.pro b/tests/unit/codemodelbackend/codemodelbackend.pro
index 3eb2aab4a1..cbd0d9bb05 100644
--- a/tests/unit/codemodelbackend/codemodelbackend.pro
+++ b/tests/unit/codemodelbackend/codemodelbackend.pro
@@ -1,5 +1,5 @@
TEMPLATE = subdirs
-SUBDIRS = process unittest
+SUBDIRS = echoserver unittest
-unittest.depends = process
+unittest.depends = echoserver
diff --git a/tests/unit/codemodelbackend/process/echoipcserver.cpp b/tests/unit/codemodelbackend/echoserver/echoipcserver.cpp
index 669a22f767..669a22f767 100644
--- a/tests/unit/codemodelbackend/process/echoipcserver.cpp
+++ b/tests/unit/codemodelbackend/echoserver/echoipcserver.cpp
diff --git a/tests/unit/codemodelbackend/process/echoipcserver.h b/tests/unit/codemodelbackend/echoserver/echoipcserver.h
index 49d71bd804..49d71bd804 100644
--- a/tests/unit/codemodelbackend/process/echoipcserver.h
+++ b/tests/unit/codemodelbackend/echoserver/echoipcserver.h
diff --git a/tests/unit/codemodelbackend/process/process.pro b/tests/unit/codemodelbackend/echoserver/echoserver.pro
index 3bef994a72..361c049de5 100644
--- a/tests/unit/codemodelbackend/process/process.pro
+++ b/tests/unit/codemodelbackend/echoserver/echoserver.pro
@@ -2,7 +2,7 @@ QT += core network
QT -= gui
-TARGET = codemodelbackendserver
+TARGET = echoserver
CONFIG += console c++14
CONFIG -= app_bundle
@@ -14,8 +14,8 @@ include(../../../../src/libs/codemodelbackendipc/codemodelbackendipc-lib.pri)
include(../../../../src/libs/sqlite/sqlite-lib.pri)
SOURCES += \
- codemodelbackendserverprocessmain.cpp \
- echoipcserver.cpp
+ echoipcserver.cpp \
+ echoserverprocessmain.cpp
HEADERS += \
echoipcserver.h
diff --git a/tests/unit/codemodelbackend/process/codemodelbackendserverprocessmain.cpp b/tests/unit/codemodelbackend/echoserver/echoserverprocessmain.cpp
index 0f9b020555..0f9b020555 100644
--- a/tests/unit/codemodelbackend/process/codemodelbackendserverprocessmain.cpp
+++ b/tests/unit/codemodelbackend/echoserver/echoserverprocessmain.cpp
diff --git a/tests/unit/codemodelbackend/unittest/clientserveroutsideprocess.cpp b/tests/unit/codemodelbackend/unittest/clientserveroutsideprocess.cpp
index 4af8f1a861..a732a4c454 100644
--- a/tests/unit/codemodelbackend/unittest/clientserveroutsideprocess.cpp
+++ b/tests/unit/codemodelbackend/unittest/clientserveroutsideprocess.cpp
@@ -161,7 +161,8 @@ TEST_F(ClientServerOutsideProcess, SendUnregisterProjectPartsForCodeCompletionCo
void ClientServerOutsideProcess::SetUpTestCase()
{
- client.setProcessPath(QStringLiteral("../process/codemodelbackendserver"));
+ client.setProcessPath(QStringLiteral("../echoserver/echoserver"));
+
ASSERT_TRUE(client.connectToServer());
}