2 files changed, 31 insertions, 4 deletions
diff --git a/tests/unit/echoserver/echoserver.qbs b/tests/unit/echoserver/echoserver.qbs
new file mode 100644
index 0000000000..77df73a6d6
--- /dev/null
+++ b/tests/unit/echoserver/echoserver.qbs
@@ -0,0 +1,30 @@
+import qbs.FileInfo
+
+QtcProduct {
+    name: "echoserver"
+    type: "application"
+    targetName: "echo"
+    consoleApplication: true
+    destinationDirectory: FileInfo.joinPaths(project.buildDirectory,
+        FileInfo.relativePath(project.ide_source_tree, sourceDirectory))
+    install: false
+
+    Depends { name: "qtc" }
+    Depends { name: "ClangSupport" }
+    Depends { name: "Sqlite" }
+    Depends { name: "Utils" }
+    Depends { name: "Qt.network" }
+
+    cpp.defines: ["CLANGSUPPORT_TESTS", "DONT_CHECK_MESSAGE_COUNTER"]
+    cpp.dynamicLibraries: qbs.targetOS.contains("unix:") ? ["dl"] : []
+    cpp.rpaths: [
+        FileInfo.joinPaths(project.buildDirectory, qtc.ide_library_path),
+        FileInfo.joinPaths(project.buildDirectory, qtc.ide_plugin_path)
+    ]
+
+    files: [
+        "echoclangcodemodelserver.cpp",
+        "echoclangcodemodelserver.h",
+        "echoserverprocessmain.cpp",
+    ]
+}
diff --git a/tests/unit/echoserver/echoserverprocessmain.cpp b/tests/unit/echoserver/echoserverprocessmain.cpp
index 07010b0b91..5225007617 100644
--- a/tests/unit/echoserver/echoserverprocessmain.cpp
+++ b/tests/unit/echoserver/echoserverprocessmain.cpp
@@ -43,12 +43,9 @@ int main(int argc, char *argv[])
 
     QCoreApplication application(argc, argv);
 
-
     if (application.arguments().count() < 2)
         return 1;
-    else if (application.arguments().count() == 3)
-        *(int*)0 = 0;
-    else if (application.arguments().contains("connectionName"))
+    if (application.arguments().contains("connectionName"))
         return 0;
 
     EchoClangCodeModelServer echoClangCodeModelServer;