diff options
Diffstat (limited to 'tests')
11 files changed, 19 insertions, 3 deletions
diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp index 0f60d6c7db..3b59a9cce8 100644 --- a/tests/auto/debugger/tst_dumpers.cpp +++ b/tests/auto/debugger/tst_dumpers.cpp @@ -90,7 +90,8 @@ static bool generateEnvironmentSettings(Utils::Environment &env, // if Creator is launched within a session set up by setenv.cmd. env.unset("ORIGINALPATH"); run.setEnvironment(env); - const QString cmdPath = QString::fromLocal8Bit(qgetenv("COMSPEC")); + const Utils::FilePath cmdPath + = Utils::FilePath::fromString(QString::fromLocal8Bit(qgetenv("COMSPEC"))); // Windows SDK setup scripts require command line switches for environment expansion. QString cmdArguments = " /E:ON /V:ON /c \"" + QDir::toNativeSeparators(saver.fileName()) + '"'; run.setCommand(Utils::CommandLine(cmdPath, cmdArguments)); diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/CMakeLists.txt b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/CMakeLists.txt index b5d95b8c91..0d3e8e3858 100644 --- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/CMakeLists.txt +++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/CMakeLists.txt @@ -3,4 +3,5 @@ add_qtc_plugin(plugin1 SOURCES plugin1.cpp plugin1.h PLUGIN_PATH "${TEST_PLUGIN_PATH}" + SKIP_INSTALL ) diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/CMakeLists.txt b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/CMakeLists.txt index bb862240ea..fd58e173c2 100644 --- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/CMakeLists.txt +++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/CMakeLists.txt @@ -3,4 +3,5 @@ add_qtc_plugin(plugin2 SOURCES plugin2.cpp plugin2.h PLUGIN_PATH "${TEST_PLUGIN_PATH}" + SKIP_INSTALL ) diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/CMakeLists.txt b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/CMakeLists.txt index 211ce4ab30..dec94785f1 100644 --- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/CMakeLists.txt +++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/CMakeLists.txt @@ -3,4 +3,5 @@ add_qtc_plugin(plugin3 SOURCES plugin3.cpp plugin3.h PLUGIN_PATH "${TEST_PLUGIN_PATH}" + SKIP_INSTALL ) diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/CMakeLists.txt b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/CMakeLists.txt index 737cf2a9f7..6302992c2a 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/CMakeLists.txt +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/CMakeLists.txt @@ -4,4 +4,5 @@ add_qtc_plugin(correct_plugin1 SOURCES plugin1.cpp plugin1.h PLUGIN_PATH "${TEST_PLUGIN_PATH}" + SKIP_INSTALL ) diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/CMakeLists.txt b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/CMakeLists.txt index 9a366d4b03..075a08e58d 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/CMakeLists.txt +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/CMakeLists.txt @@ -4,4 +4,5 @@ add_qtc_plugin(correct_plugin2 SOURCES plugin2.cpp plugin2.h PLUGIN_PATH "${TEST_PLUGIN_PATH}" + SKIP_INSTALL ) diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/CMakeLists.txt b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/CMakeLists.txt index 8564a2a21d..2326ac08b4 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/CMakeLists.txt +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/CMakeLists.txt @@ -4,4 +4,5 @@ add_qtc_plugin(correct_plugin3 SOURCES plugin3.cpp plugin3.h PLUGIN_PATH "${TEST_PLUGIN_PATH}" + SKIP_INSTALL ) diff --git a/tests/auto/extensionsystem/pluginspec/testplugin/CMakeLists.txt b/tests/auto/extensionsystem/pluginspec/testplugin/CMakeLists.txt index 2a01133532..df9fe19244 100644 --- a/tests/auto/extensionsystem/pluginspec/testplugin/CMakeLists.txt +++ b/tests/auto/extensionsystem/pluginspec/testplugin/CMakeLists.txt @@ -15,6 +15,7 @@ add_qtc_plugin(testplugin PLUGIN_PATH "${CMAKE_CURRENT_BINARY_DIR}" PROPERTIES OUTPUT_NAME ${plugin_output_name} + SKIP_INSTALL ) # The empty string gets removed if I put it above diff --git a/tests/auto/ssh/tst_ssh.cpp b/tests/auto/ssh/tst_ssh.cpp index 22e7062fde..5ce94b7462 100644 --- a/tests/auto/ssh/tst_ssh.cpp +++ b/tests/auto/ssh/tst_ssh.cpp @@ -313,8 +313,7 @@ void tst_Ssh::remoteProcessInput() SshConnection connection(params); QVERIFY(waitForConnection(connection)); - SshRemoteProcessPtr catProcess - = connection.createRemoteProcess(QString::fromLatin1("/bin/cat").toUtf8()); + SshRemoteProcessPtr catProcess = connection.createRemoteProcess("/bin/cat"); QEventLoop loop; connect(catProcess.get(), &SshRemoteProcess::started, &loop, &QEventLoop::quit); connect(catProcess.get(), &SshRemoteProcess::done, &loop, &QEventLoop::quit); diff --git a/tests/unit/echoserver/CMakeLists.txt b/tests/unit/echoserver/CMakeLists.txt index 299b8a2b3a..ce3065be8b 100644 --- a/tests/unit/echoserver/CMakeLists.txt +++ b/tests/unit/echoserver/CMakeLists.txt @@ -4,4 +4,5 @@ add_qtc_executable(echo SOURCES echoclangcodemodelserver.cpp echoclangcodemodelserver.h echoserverprocessmain.cpp + SKIP_INSTALL ) diff --git a/tests/unit/unittest/projectupdater-test.cpp b/tests/unit/unittest/projectupdater-test.cpp index d5da706b55..960a256469 100644 --- a/tests/unit/unittest/projectupdater-test.cpp +++ b/tests/unit/unittest/projectupdater-test.cpp @@ -310,6 +310,14 @@ TEST_F(ProjectUpdater, CreateSortedCompilerMacros) CompilerMacro{"DEFINE", "1", 3})); } +TEST_F(ProjectUpdater, FilterCompilerMacros) +{ + auto paths = updater.createCompilerMacros( + {{"DEFINE", "1"}, {"QT_TESTCASE_BUILDDIR", "2"}, {"BAR", "1"}}); + + ASSERT_THAT(paths, ElementsAre(CompilerMacro{"BAR", "1", 1}, CompilerMacro{"DEFINE", "1", 3})); +} + TEST_F(ProjectUpdater, CreateSortedIncludeSearchPaths) { CppTools::ProjectPart projectPart; |