diff options
| author | Marco Bubke <marco.bubke@theqtcompany.com> | 2015-05-13 18:57:56 +0200 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@theqtcompany.com> | 2015-05-21 11:30:36 +0000 |
| commit | 3c399e722cbe49410dd25354bf59cae6042f2354 (patch) | |
| tree | bc05fe75808cccebae1f59b5a478cae3a0fe4633 | |
| parent | f7e373ed42b0f33e6835918d7a7f96b863448a18 (diff) | |
| download | qt-creator-3c399e722cbe49410dd25354bf59cae6042f2354.tar.gz | |
Fix window path for echo server
Change-Id: I4adc49b5493632a9c2f8e1d3b487036088fc2ce3
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
3 files changed, 10 insertions, 2 deletions
diff --git a/tests/unit/codemodelbackend/echoserver/echoserver.pro b/tests/unit/codemodelbackend/echoserver/echoserver.pro index 26e0f5f51e..7894618441 100644 --- a/tests/unit/codemodelbackend/echoserver/echoserver.pro +++ b/tests/unit/codemodelbackend/echoserver/echoserver.pro @@ -2,7 +2,7 @@ QT += core network QT -= gui -TARGET = echoserver +TARGET = echo CONFIG += console c++14 CONFIG -= app_bundle diff --git a/tests/unit/codemodelbackend/unittest/clientserveroutsideprocess.cpp b/tests/unit/codemodelbackend/unittest/clientserveroutsideprocess.cpp index 6ab95e7c64..5b8b071306 100644 --- a/tests/unit/codemodelbackend/unittest/clientserveroutsideprocess.cpp +++ b/tests/unit/codemodelbackend/unittest/clientserveroutsideprocess.cpp @@ -59,6 +59,12 @@ #include <mockipclient.h> +#ifdef Q_OS_WIN +#define QTC_HOST_EXE_SUFFIX L".exe" +#else +#define QTC_HOST_EXE_SUFFIX "" +#endif + using namespace CodeModelBackEnd; using ::testing::Eq; @@ -161,7 +167,7 @@ TEST_F(ClientServerOutsideProcess, SendUnregisterProjectPartsForCodeCompletionCo void ClientServerOutsideProcess::SetUpTestCase() { - client.setProcessPath(QStringLiteral("../echoserver/echoserver")); + client.setProcessPath(QStringLiteral(ECHOSERVER QTC_HOST_EXE_SUFFIX)); ASSERT_TRUE(client.connectToServer()); } diff --git a/tests/unit/codemodelbackend/unittest/unittest.pro b/tests/unit/codemodelbackend/unittest/unittest.pro index e8d482202d..9b7012957a 100644 --- a/tests/unit/codemodelbackend/unittest/unittest.pro +++ b/tests/unit/codemodelbackend/unittest/unittest.pro @@ -81,3 +81,5 @@ DEFINES += DONT_CHECK_COMMAND_COUNTER DEFINES += GTEST_HAS_STD_INITIALIZER_LIST_ GTEST_LANG_CXX11 DEFINES += TESTDATA_DIR=\"R\\\"xxx($$PWD/data)xxx\\\"\" +win32:DEFINES += ECHOSERVER=\"R\\\"xxx($$OUT_PWD/../echo)xxx\\\"\" +unix:DEFINES += ECHOSERVER=\"R\\\"xxx($$OUT_PWD/../echoserver/echo)xxx\\\"\" |