Name tests and test helpers uniquely

Several build tools (e.g. MSBuild and CMake) do not support duplicate
application names in the project.

Change-Id: I28da2c3f25f126bee35cb7a827be80e63689c8f4
Reviewed-by: Brett Stottlemyer <bstottle@ford.com>

13 files changed, 18 insertions, 18 deletions

diff --git a/tests/auto/integration_external/client/client.pro b/tests/auto/integration_external/client/client.pro
index 4c42f5c..6bcc136 100644
--- a/tests/auto/integration_external/client/client.pro
+++ b/tests/auto/integration_external/client/client.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 QT       += remoteobjects core testlib
 QT       -= gui
 
-TARGET = client
+TARGET = integration_external_client
 DESTDIR = ./
 CONFIG   += c++11
 CONFIG   -= app_bundle
diff --git a/tests/auto/integration_external/external/tst_integration_external.cpp b/tests/auto/integration_external/external/tst_integration_external.cpp
index 8994db8..4c62e38 100644
--- a/tests/auto/integration_external/external/tst_integration_external.cpp
+++ b/tests/auto/integration_external/external/tst_integration_external.cpp
@@ -81,7 +81,7 @@ private slots:
             env.insert("TEMPLATED_REMOTING", "true");
             serverProc.setProcessEnvironment(env);
         }
-        serverProc.start(findExecutable("server", {
+        serverProc.start(findExecutable("integration_external_server", {
             QCoreApplication::applicationDirPath() + "/../server/"
         }));
         QVERIFY(serverProc.waitForStarted());
@@ -92,7 +92,7 @@ private slots:
         qDebug() << "Starting client process";
         QProcess clientProc;
         clientProc.setProcessChannelMode(QProcess::ForwardedChannels);
-        clientProc.start(findExecutable("client", {
+        clientProc.start(findExecutable("integration_external_client", {
             QCoreApplication::applicationDirPath() + "/../client/"
         }));
         QVERIFY(clientProc.waitForStarted());
diff --git a/tests/auto/integration_external/server/server.pro b/tests/auto/integration_external/server/server.pro
index 7f3f735..73b79b3 100644
--- a/tests/auto/integration_external/server/server.pro
+++ b/tests/auto/integration_external/server/server.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 QT       += remoteobjects core testlib
 QT       -= gui
 
-TARGET = server
+TARGET = integration_external_server
 DESTDIR = ./
 CONFIG   += c++11
 CONFIG   -= app_bundle
diff --git a/tests/auto/integration_multiprocess/client/client.pro b/tests/auto/integration_multiprocess/client/client.pro
index 4c42f5c..084e665 100644
--- a/tests/auto/integration_multiprocess/client/client.pro
+++ b/tests/auto/integration_multiprocess/client/client.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 QT       += remoteobjects core testlib
 QT       -= gui
 
-TARGET = client
+TARGET = integration_multiprocess_client
 DESTDIR = ./
 CONFIG   += c++11
 CONFIG   -= app_bundle
diff --git a/tests/auto/integration_multiprocess/server/server.pro b/tests/auto/integration_multiprocess/server/server.pro
index d210d53..71f9160 100644
--- a/tests/auto/integration_multiprocess/server/server.pro
+++ b/tests/auto/integration_multiprocess/server/server.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 QT       += remoteobjects core testlib
 QT       -= gui
 
-TARGET = server
+TARGET = integration_multiprocess_server
 DESTDIR = ./
 CONFIG   += c++11
 CONFIG   -= app_bundle
diff --git a/tests/auto/integration_multiprocess/tst/tst_integration_multiprocess.cpp b/tests/auto/integration_multiprocess/tst/tst_integration_multiprocess.cpp
index fe5d929..ccdc973 100644
--- a/tests/auto/integration_multiprocess/tst/tst_integration_multiprocess.cpp
+++ b/tests/auto/integration_multiprocess/tst/tst_integration_multiprocess.cpp
@@ -81,7 +81,7 @@ private slots:
             env.insert("TEMPLATED_REMOTING", "true");
             serverProc.setProcessEnvironment(env);
         }
-        serverProc.start(findExecutable("server", {
+        serverProc.start(findExecutable("integration_multiprocess_server", {
             QCoreApplication::applicationDirPath() + "/../server/"
         }));
         QVERIFY(serverProc.waitForStarted());
@@ -92,7 +92,7 @@ private slots:
         qDebug() << "Starting client process";
         QProcess clientProc;
         clientProc.setProcessChannelMode(QProcess::ForwardedChannels);
-        clientProc.start(findExecutable("client", {
+        clientProc.start(findExecutable("integration_multiprocess_client", {
             QCoreApplication::applicationDirPath() + "/../client/"
         }));
         QVERIFY(clientProc.waitForStarted());
diff --git a/tests/auto/proxy_multiprocess/client/client.pro b/tests/auto/proxy_multiprocess/client/client.pro
index 7a181a2..aad86e2 100644
--- a/tests/auto/proxy_multiprocess/client/client.pro
+++ b/tests/auto/proxy_multiprocess/client/client.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 QT       += remoteobjects core testlib
 QT       -= gui
 
-TARGET = client
+TARGET = proxy_multiprocess_client
 DESTDIR = ./
 CONFIG   += c++11
 CONFIG   -= app_bundle
diff --git a/tests/auto/proxy_multiprocess/server/server.pro b/tests/auto/proxy_multiprocess/server/server.pro
index 02ca498..a56477b 100644
--- a/tests/auto/proxy_multiprocess/server/server.pro
+++ b/tests/auto/proxy_multiprocess/server/server.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 QT       += remoteobjects core testlib
 QT       -= gui
 
-TARGET = server
+TARGET = proxy_multiprocess_server
 DESTDIR = ./
 CONFIG   += c++11
 CONFIG   -= app_bundle
diff --git a/tests/auto/proxy_multiprocess/tst/tst_proxy_multiprocess.cpp b/tests/auto/proxy_multiprocess/tst/tst_proxy_multiprocess.cpp
index e7f382b..6973101 100644
--- a/tests/auto/proxy_multiprocess/tst/tst_proxy_multiprocess.cpp
+++ b/tests/auto/proxy_multiprocess/tst/tst_proxy_multiprocess.cpp
@@ -89,7 +89,7 @@ private slots:
             env.insert("TEMPLATED_REMOTING", "true");
         }
         serverProc.setProcessEnvironment(env);
-        serverProc.start(findExecutable("server", {
+        serverProc.start(findExecutable("proxy_multiprocess_server", {
             QCoreApplication::applicationDirPath() + "/../server/"
         }));
         QVERIFY(serverProc.waitForStarted());
@@ -102,7 +102,7 @@ private slots:
         QProcess clientProc;
         clientProc.setProcessChannelMode(QProcess::ForwardedChannels);
         clientProc.setProcessEnvironment(env);
-        clientProc.start(findExecutable("client", {
+        clientProc.start(findExecutable("proxy_multiprocess_client", {
             QCoreApplication::applicationDirPath() + "/../client/"
         }));
         QVERIFY(clientProc.waitForStarted());
diff --git a/tests/auto/repc/pods/pods.pro b/tests/auto/repc/pods/pods.pro
index c32fffa..dc7b717 100644
--- a/tests/auto/repc/pods/pods.pro
+++ b/tests/auto/repc/pods/pods.pro
@@ -1,5 +1,5 @@
 CONFIG += testcase
-TARGET = tst_pods
+TARGET = tst_repc_pods
 QT += testlib remoteobjects
 QT -= gui
 
diff --git a/tests/auto/restart/client/client.pro b/tests/auto/restart/client/client.pro
index ce435c2..24a83b3 100644
--- a/tests/auto/restart/client/client.pro
+++ b/tests/auto/restart/client/client.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 QT       += remoteobjects core testlib
 QT       -= gui
 
-TARGET = client
+TARGET = restart_client
 DESTDIR = ./
 CONFIG   += c++11
 CONFIG   -= app_bundle
diff --git a/tests/auto/restart/server/server.pro b/tests/auto/restart/server/server.pro
index a5a7d7e..4ad55ee 100644
--- a/tests/auto/restart/server/server.pro
+++ b/tests/auto/restart/server/server.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 QT       += remoteobjects core testlib
 QT       -= gui
 
-TARGET = server
+TARGET = restart_server
 DESTDIR = ./
 CONFIG   += c++11
 CONFIG   -= app_bundle
diff --git a/tests/auto/restart/tst/tst_restart.cpp b/tests/auto/restart/tst/tst_restart.cpp
index a3633fa..d76b3de 100644
--- a/tests/auto/restart/tst/tst_restart.cpp
+++ b/tests/auto/restart/tst/tst_restart.cpp
@@ -96,7 +96,7 @@ private slots:
         env.insert("RunMode", QVariant::fromValue(runMode).toString());
         env.insert("ObjectMode", QVariant::fromValue(objectMode).toString());
         serverProc.setProcessEnvironment(env);
-        serverProc.start(findExecutable("server", {
+        serverProc.start(findExecutable("restart_server", {
             QCoreApplication::applicationDirPath() + "/../server/"
         }));
         QVERIFY(serverProc.waitForStarted());
@@ -108,7 +108,7 @@ private slots:
         QProcess clientProc;
         clientProc.setProcessChannelMode(QProcess::ForwardedChannels);
         clientProc.setProcessEnvironment(env);
-        clientProc.start(findExecutable("client", {
+        clientProc.start(findExecutable("restart_client", {
             QCoreApplication::applicationDirPath() + "/../client/"
         }));
         QVERIFY(clientProc.waitForStarted());
@@ -123,7 +123,7 @@ private slots:
                 QCOMPARE(serverProc.exitCode(), 0);
             qDebug() << "Restarting server";
             serverProc.setProcessEnvironment(env);
-            serverProc.start(findExecutable("server", {
+            serverProc.start(findExecutable("restart_server", {
                 QCoreApplication::applicationDirPath() + "/../server/"
             }));
             QVERIFY(serverProc.waitForStarted());