diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-11-17 16:19:57 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-11-22 15:41:43 +0000 |
| commit | 3b55e4b03499730085924edfdf04b140ef62274e (patch) | |
| tree | fee3b33cdc91d2e68531c4b6757e9443df0f7741 /tests/auto | |
| parent | df04c86b873ae6167230e66c5a33b2a460e86da0 (diff) | |
Give the setupRunEnvironment script an additional parameter
Required by follow-up commit.
[ChangeLog] The Module.setupRunEnvironment script now has a new parameter
"config". Users can set it via the --setup-run-env-config option of the
run command.
Change-Id: I1be57fcff5321874cf3dcf4fb3a7ef7d6f69a8a5
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/api/tst_api.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/cmdlineparser/tst_cmdlineparser.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tests/auto/api/tst_api.cpp b/tests/auto/api/tst_api.cpp index 72bc11114..340c661cd 100644 --- a/tests/auto/api/tst_api.cpp +++ b/tests/auto/api/tst_api.cpp @@ -1048,7 +1048,7 @@ void TestApi::errorInSetupRunEnvironment() try { const SettingsPtr s = settings(); qbs::RunEnvironment runEnv = project.getRunEnvironment(product, qbs::InstallOptions(), - QProcessEnvironment(), s.get()); + QProcessEnvironment(), QStringList(), s.get()); qbs::ErrorInfo error; const QProcessEnvironment env = runEnv.runEnvironment(&error); QVERIFY(error.hasError()); diff --git a/tests/auto/cmdlineparser/tst_cmdlineparser.cpp b/tests/auto/cmdlineparser/tst_cmdlineparser.cpp index d56081cf1..59f4adbc3 100644 --- a/tests/auto/cmdlineparser/tst_cmdlineparser.cpp +++ b/tests/auto/cmdlineparser/tst_cmdlineparser.cpp @@ -170,6 +170,9 @@ private slots: QVERIFY(parser.showVersion()); QVERIFY(parser.parseCommandLine(QStringList("-V"))); QVERIFY(parser.showVersion()); + + QVERIFY(parser.parseCommandLine(QStringList{"run", "--setup-run-env-config", "x,y,z"})); + QCOMPARE(parser.runEnvConfig(), QStringList({"x", "y", "z"})); } void testInvalidCommandLine() |