diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2018-02-16 16:01:18 +0100 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-02-16 20:11:27 +0000 |
commit | e45143de728dc1b0ef7415edb1686fa38ddd0942 (patch) | |
tree | cec34b077f7ecc9441ef55bcd24133ba522b7588 /tests/auto/blackbox/tst_blackboxandroid.cpp | |
parent | 1e142242fc462ebfa5c84339c8f2de2273712ece (diff) |
Android autotest: Get the jar file path from qbs
There is no guarantee that we find it in the environment.
Change-Id: I58281b5936e0ddad51cbdbe0833f62c4dbb42c1d
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'tests/auto/blackbox/tst_blackboxandroid.cpp')
-rw-r--r-- | tests/auto/blackbox/tst_blackboxandroid.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/blackbox/tst_blackboxandroid.cpp b/tests/auto/blackbox/tst_blackboxandroid.cpp index b47894234..7ad008bdf 100644 --- a/tests/auto/blackbox/tst_blackboxandroid.cpp +++ b/tests/auto/blackbox/tst_blackboxandroid.cpp @@ -60,6 +60,7 @@ QMap<QString, QString> TestBlackboxAndroid::findAndroid(int *status, const QStri {"sdk-build-tools-dx", QDir::fromNativeSeparators(tools["sdk-build-tools-dx"].toString())}, {"ndk", QDir::fromNativeSeparators(tools["ndk"].toString())}, {"ndk-samples", QDir::fromNativeSeparators(tools["ndk-samples"].toString())}, + {"jar", QDir::fromNativeSeparators(tools["jar"].toString())}, }; } @@ -109,7 +110,7 @@ void TestBlackboxAndroid::android() const QString apkFilePath = relativeProductBuildDir(productName, configName) + '/' + productName + ".apk"; QVERIFY2(regularFileExists(apkFilePath), qPrintable(apkFilePath)); - const QString jarFilePath = findExecutable(QStringList("jar")); + const QString jarFilePath = androidPaths["jar"]; QVERIFY(!jarFilePath.isEmpty()); QProcess jar; jar.start(jarFilePath, QStringList() << "-tf" << apkFilePath); |