diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-12-08 13:29:21 -0800 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2016-12-09 09:29:32 +0000 |
| commit | 64e336b7af5b863de7e8108448f9103706786714 (patch) | |
| tree | a29b0cf702b673d0d98e1909e21bbeed296ce79a | |
| parent | 8cd0f9be320c821d1e54b6b52afea0695757b536 (diff) | |
Fix javaDependencyTrackingInnerClass test when Java is not installedv1.7.0
Change-Id: Ie700233a6b65eb094291e81b274de539e8c2fb51
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | tests/auto/blackbox/tst_blackboxjava.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/tests/auto/blackbox/tst_blackboxjava.cpp b/tests/auto/blackbox/tst_blackboxjava.cpp index 87cb92436..8268d6adb 100644 --- a/tests/auto/blackbox/tst_blackboxjava.cpp +++ b/tests/auto/blackbox/tst_blackboxjava.cpp @@ -290,10 +290,18 @@ void TestBlackboxJava::javaDependencyTracking() void TestBlackboxJava::javaDependencyTrackingInnerClass() { + Settings settings((QString())); + Profile p(profileName(), &settings); + QDir::setCurrent(testDataDir + "/java/inner-class"); QbsRunParameters params; params.expectFailure = true; - QCOMPARE(runQbs(params), 0); + int status = runQbs(params); + if (p.value("java.jdkPath").toString().isEmpty() + && status != 0 && m_qbsStderr.contains("jdkPath")) { + QSKIP("java.jdkPath not set and automatic detection failed"); + } + QCOMPARE(status, 0); QEXPECT_FAIL(0, "QBS-1069", Abort); QVERIFY(!m_qbsStderr.contains("QBS-1069")); } |