diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-05-27 09:00:21 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-05-30 14:50:53 +0000 |
| commit | b13a5e2a07764dbf92736a2c89e65af0d26c4556 (patch) | |
| tree | 4891901c267daa993b7aaa297cfd1fc66dbb5a25 /tests/auto/blackbox/tst_blackboxjava.cpp | |
| parent | a66281bec7dca8a0c733ecc4c61bc0415c0a3dfa (diff) | |
Add properties to indicate the Android NDK samples directory
This was removed from the actual NDK in r11, and so can be set to the
external googlesamples/android-ndk repository on github.com.
Change-Id: Ie47883ebd003c119583b4a3321041ebbbf401029
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'tests/auto/blackbox/tst_blackboxjava.cpp')
| -rw-r--r-- | tests/auto/blackbox/tst_blackboxjava.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/blackbox/tst_blackboxjava.cpp b/tests/auto/blackbox/tst_blackboxjava.cpp index 0dc7e6346..50c7dd5df 100644 --- a/tests/auto/blackbox/tst_blackboxjava.cpp +++ b/tests/auto/blackbox/tst_blackboxjava.cpp @@ -54,6 +54,7 @@ QMap<QString, QString> TestBlackboxJava::findAndroid(int *status) return QMap<QString, QString> { {"sdk", QDir::fromNativeSeparators(tools["sdk"].toString())}, {"ndk", QDir::fromNativeSeparators(tools["ndk"].toString())}, + {"ndk-samples", QDir::fromNativeSeparators(tools["ndk-samples"].toString())}, }; } @@ -71,8 +72,9 @@ void TestBlackboxJava::android() const auto androidPaths = findAndroid(&status); const auto ndkPath = androidPaths["ndk"]; + const auto ndkSamplesPath = androidPaths["ndk-samples"]; static const QStringList ndkSamplesDirs = QStringList() << "teapot" << "no-native"; - if (!ndkPath.isEmpty() && !QFileInfo(ndkPath + "/samples").isDir() + if (!ndkPath.isEmpty() && !QFileInfo(ndkSamplesPath).isDir() && ndkSamplesDirs.contains(projectDir)) QSKIP("NDK samples directory not present"); |