From ec9a72808f039de1fe1e434f89f48ec10f91b352 Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@qt.io>
Date: Wed, 27 Jan 2021 11:51:36 +0100
Subject: [PATCH] Tests: Fix pluginspecs test for cmake

Change-Id: I700bd9cbcdabfa08863ffb727a084a9339e660d5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 tests/auto/extensionsystem/pluginspec/CMakeLists.txt     | 1 +
 tests/auto/extensionsystem/pluginspec/test.pro           | 1 +
 tests/auto/extensionsystem/pluginspec/test.qbs           | 3 ++-
 .../extensionsystem/pluginspec/testplugin/CMakeLists.txt | 9 ++++-----
 tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp | 2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/tests/auto/extensionsystem/pluginspec/CMakeLists.txt b/tests/auto/extensionsystem/pluginspec/CMakeLists.txt
index 83804679899..670412bfd84 100644
--- a/tests/auto/extensionsystem/pluginspec/CMakeLists.txt
+++ b/tests/auto/extensionsystem/pluginspec/CMakeLists.txt
@@ -4,6 +4,7 @@ add_qtc_test(tst_pluginspec
   DEFINES
     PLUGIN_DIR="${CMAKE_CURRENT_BINARY_DIR}"
     PLUGINSPEC_DIR="${CMAKE_CURRENT_SOURCE_DIR}"
+    DLL_INFIX="d${PROJECT_VERSION_MAJOR}"
   DEPENDS ExtensionSystem
   SOURCES
     tst_pluginspec.cpp
diff --git a/tests/auto/extensionsystem/pluginspec/test.pro b/tests/auto/extensionsystem/pluginspec/test.pro
index 2a24f0d3376..31b3f2763f9 100644
--- a/tests/auto/extensionsystem/pluginspec/test.pro
+++ b/tests/auto/extensionsystem/pluginspec/test.pro
@@ -24,3 +24,4 @@ include(../../qttest.pri)
 
 DEFINES += "PLUGINSPEC_DIR=\\\"$$PWD\\\""
 DEFINES += "PLUGIN_DIR=\\\"$$OUT_PWD\\\""
+DEFINES += "DLL_INFIX=\\\"d$$section(QTCREATOR_VERSION, ., 0, 0)\\\""
diff --git a/tests/auto/extensionsystem/pluginspec/test.qbs b/tests/auto/extensionsystem/pluginspec/test.qbs
index 0a5e9297392..88a009982f6 100644
--- a/tests/auto/extensionsystem/pluginspec/test.qbs
+++ b/tests/auto/extensionsystem/pluginspec/test.qbs
@@ -9,7 +9,8 @@ QtcAutotest {
         files: "tst_pluginspec.cpp"
         cpp.defines: outer.concat([
             'PLUGIN_DIR="' + destinationDirectory + '"',
-            'PLUGINSPEC_DIR="' + sourceDirectory + '"'
+            'PLUGINSPEC_DIR="' + sourceDirectory + '"',
+            'DLL_INFIX=""'
         ])
     }
 
diff --git a/tests/auto/extensionsystem/pluginspec/testplugin/CMakeLists.txt b/tests/auto/extensionsystem/pluginspec/testplugin/CMakeLists.txt
index d52f1c98d04..a77550fa468 100644
--- a/tests/auto/extensionsystem/pluginspec/testplugin/CMakeLists.txt
+++ b/tests/auto/extensionsystem/pluginspec/testplugin/CMakeLists.txt
@@ -2,9 +2,9 @@
 if(APPLE)
   set(plugin_output_name "libtest_debug")
 elseif(UNIX)
-  set(plugin_output_name "liblibtest")
+  set(plugin_output_name "libtest")
 else()
-  set(plugin_output_name "testd4")
+  set(plugin_output_name "testd")
 endif()
 
 file(RELATIVE_PATH TEST_PLUGIN_PATH ${QtCreator_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR})
@@ -15,13 +15,12 @@ add_qtc_plugin(testplugin
   SOURCES
     testplugin.cpp testplugin.h
   PLUGIN_PATH "${TEST_PLUGIN_PATH}"
-  PROPERTIES
-    OUTPUT_NAME ${plugin_output_name}
   SKIP_INSTALL
   INTERNAL_ONLY
 )
 
 # The empty string gets removed if I put it above
 if (TARGET testplugin)
-  set_target_properties(testplugin PROPERTIES PREFIX "")
+  set_target_properties(testplugin PROPERTIES PREFIX ""
+                                              OUTPUT_NAME "${plugin_output_name}")
 endif()
diff --git a/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp b/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp
index c5a11a0110c..a0ada8154a1 100644
--- a/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp
+++ b/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp
@@ -60,7 +60,7 @@ static QString libraryName(const QString &basename)
 #elif defined(Q_OS_UNIX)
     return QLatin1String("lib") + basename + QLatin1String(".so");
 #else
-    return basename + QLatin1String("d4.dll");
+    return basename + QLatin1String(DLL_INFIX ".dll");
 #endif
 }