feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Squish: Remove unused code

Browse Source 
Change-Id: I245a37cbf5671a31ea9e627221c3f4cf8a94d59d
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2022-09-14 13:58:30 +02:00
parent 296a36ff16
commit 93c503fa30
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/squish/squishtools.cpp
View File

@@ -215,9 +215,7 @@ struct SquishToolsSettings
static SquishToolsSettings toolsSettings; static SquishToolsSettings toolsSettings;
void SquishTools::runTestCases(const QString &suitePath, void SquishTools::runTestCases(const QString &suitePath,
const QStringList &testCases, const QStringList &testCases)
const QStringList &additionalServerArgs,
const QStringList &additionalRunnerArgs)
{ {
if (m_shutdownInitiated) if (m_shutdownInitiated)
return; return;
@@ -240,12 +238,11 @@ void SquishTools::runTestCases(const QString &suitePath,
m_suitePath = suitePath; m_suitePath = suitePath;
m_testCases = testCases; m_testCases = testCases;
m_reportFiles.clear(); m_reportFiles.clear();
m_additionalServerArguments = additionalServerArgs;
const QString dateTimeString = QDateTime::currentDateTime().toString("yyyy-MM-ddTHH-mm-ss"); const QString dateTimeString = QDateTime::currentDateTime().toString("yyyy-MM-ddTHH-mm-ss");
m_currentResultsDirectory = QFileInfo(QDir(resultsDirectory), dateTimeString).absoluteFilePath(); m_currentResultsDirectory = QFileInfo(QDir(resultsDirectory), dateTimeString).absoluteFilePath();
m_additionalRunnerArguments = additionalRunnerArgs; m_additionalRunnerArguments.clear();
m_additionalRunnerArguments << "--interactive" << "--resultdir" m_additionalRunnerArguments << "--interactive" << "--resultdir"
<< QDir::toNativeSeparators(m_currentResultsDirectory); << QDir::toNativeSeparators(m_currentResultsDirectory);
@@ -513,7 +510,6 @@ void SquishTools::setIdle()
m_currentTestCasePath.clear(); m_currentTestCasePath.clear();
m_reportFiles.clear(); m_reportFiles.clear();
m_additionalRunnerArguments.clear(); m_additionalRunnerArguments.clear();
m_additionalServerArguments.clear();
m_perspective.setPerspectiveMode(SquishPerspective::NoMode); m_perspective.setPerspectiveMode(SquishPerspective::NoMode);
m_currentResultsDirectory.clear(); m_currentResultsDirectory.clear();
m_lastTopLevelWindows.clear(); m_lastTopLevelWindows.clear();
@@ -1267,7 +1263,6 @@ QStringList SquishTools::serverArgumentsFromSettings() const
QStringList SquishTools::runnerArgumentsFromSettings() QStringList SquishTools::runnerArgumentsFromSettings()
{ {
QStringList arguments; QStringList arguments;
arguments << m_additionalServerArguments;
if (!toolsSettings.isLocalServer) if (!toolsSettings.isLocalServer)
arguments << "--host" << toolsSettings.serverHost; arguments << "--host" << toolsSettings.serverHost;
arguments << "--port" << QString::number(m_serverPort); arguments << "--port" << QString::number(m_serverPort);

5
src/plugins/squish/squishtools.h
View File

@@ -62,9 +62,7 @@ public:
State state() const { return m_state; } State state() const { return m_state; }
void runTestCases(const QString &suitePath, void runTestCases(const QString &suitePath,
const QStringList &testCases = QStringList(), const QStringList &testCases = QStringList());
const QStringList &additionalServerArgs = QStringList(),
const QStringList &additionalRunnerArgs = QStringList());
void recordTestCase(const QString &suitePath, const QString &testCaseName, void recordTestCase(const QString &suitePath, const QString &testCaseName,
const SuiteConf &suiteConf); const SuiteConf &suiteConf);
void queryServerSettings(); void queryServerSettings();
@@ -155,7 +153,6 @@ private:
Utils::FilePath m_currentRecorderSnippetFile; Utils::FilePath m_currentRecorderSnippetFile;
QFile *m_currentResultsXML = nullptr; QFile *m_currentResultsXML = nullptr;
QFileSystemWatcher *m_resultsFileWatcher = nullptr; QFileSystemWatcher *m_resultsFileWatcher = nullptr;
QStringList m_additionalServerArguments;
QStringList m_additionalRunnerArguments; QStringList m_additionalRunnerArguments;
QList<QStringList> m_serverConfigChanges; QList<QStringList> m_serverConfigChanges;
QWindowList m_lastTopLevelWindows; QWindowList m_lastTopLevelWindows;