diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2017-06-12 12:17:03 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-06-12 12:18:03 +0000 |
commit | ee0ead13179534c8bfcce28e43d5ab47104455ad (patch) | |
tree | 6432434de182ca960c5c9d69a0f04977505cca5e /tests/auto/blackbox/tst_blackboxbase.cpp | |
parent | 5ba4fd79ae13fec9c615d4c3892e70b72ed26a99 (diff) |
Autotests: Improve the QbsRunParameters class
Add dedicated properties for profile and settings path, rather than test
functions having to meddle with the arguments list themselves.
Change-Id: Icf58e31174ad15f42aee2eabd8578c20b7d517fa
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests/auto/blackbox/tst_blackboxbase.cpp')
-rw-r--r-- | tests/auto/blackbox/tst_blackboxbase.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/auto/blackbox/tst_blackboxbase.cpp b/tests/auto/blackbox/tst_blackboxbase.cpp index 30e8eb095..04af84538 100644 --- a/tests/auto/blackbox/tst_blackboxbase.cpp +++ b/tests/auto/blackbox/tst_blackboxbase.cpp @@ -75,16 +75,15 @@ int TestBlackboxBase::runQbs(const QbsRunParameters ¶ms) QStringList args; if (!params.command.isEmpty()) args << params.command; - const QString settingsDir = settings()->baseDirectory(); - if (params.useProfile && !settingsDir.isEmpty() && supportsSettingsDirOption(params.command)) - args << "--settings-dir" << settingsDir; + if (!params.settingsDir.isEmpty() && supportsSettingsDirOption(params.command)) + args << "--settings-dir" << params.settingsDir; if (supportsBuildDirectoryOption(params.command)) { args.append(QLatin1String("-d")); args.append(params.buildDirectory.isEmpty() ? QLatin1String(".") : params.buildDirectory); } args << params.arguments; - if (params.useProfile) - args.append(QLatin1String("profile:") + profileName()); + if (!params.profile.isEmpty()) + args.append(QLatin1String("profile:") + params.profile); QProcess process; process.setProcessEnvironment(params.environment); process.start(qbsExecutableFilePath, args); |