diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-06-09 17:02:00 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-06-09 15:10:17 +0000 |
| commit | e44c4d94e09db1a8a0aff9863b9e0e4e91ce37b6 (patch) | |
| tree | 494c4bc64b1c877994bedec598c37068094745a4 /tests/auto/blackbox/tst_blackboxjava.cpp | |
| parent | d5a0982bf0724a5ac287b94c2cae0e9f6733bd52 (diff) | |
Fix command line overrides in a number of autotests
We forgot to adapt them when we introduced the prefixes.
Change-Id: Ic0004d593f5feb40b1ac457ea69873bd7b0d7cf2
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests/auto/blackbox/tst_blackboxjava.cpp')
| -rw-r--r-- | tests/auto/blackbox/tst_blackboxjava.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/blackbox/tst_blackboxjava.cpp b/tests/auto/blackbox/tst_blackboxjava.cpp index 18cafead9..ba2f8f753 100644 --- a/tests/auto/blackbox/tst_blackboxjava.cpp +++ b/tests/auto/blackbox/tst_blackboxjava.cpp @@ -88,7 +88,7 @@ void TestBlackboxJava::android() QDir::setCurrent(testDataDir + "/android/" + projectDir); QbsRunParameters params(QStringList("profile:" + p.name()) - << "Android.ndk.platform:android-21"); + << "modules.Android.ndk.platform:android-21"); params.useProfile = false; QCOMPARE(runQbs(params), 0); for (int i = 0; i < productNames.count(); ++i) { @@ -234,9 +234,9 @@ void TestBlackboxJava::javaDependencyTracking() QbsRunParameters rp; rp.arguments.append(flag); if (!jdkPath.isEmpty()) - rp.arguments << ("java.jdkPath:" + jdkPath); + rp.arguments << ("modules.java.jdkPath:" + jdkPath); if (!javaVersion.isEmpty()) - rp.arguments << ("java.languageVersion:'" + javaVersion + "'"); + rp.arguments << ("modules.java.languageVersion:'" + javaVersion + "'"); rmDirR(relativeBuildDir()); QCOMPARE(runQbs(rp), 0); } |