From 2ee32f352405625512eb52e978585a25f7431ae8 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 8 Nov 2017 13:51:03 +0100 Subject: [PATCH] fix tests to work when only Debian Android SDK is installed jenkins.debian.net only had `apt install android-sdk`, it does not have any of Google's packages installed. --- tests/common.TestCase | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/common.TestCase b/tests/common.TestCase index ecd16a8d..a5d52f75 100755 --- a/tests/common.TestCase +++ b/tests/common.TestCase @@ -70,7 +70,10 @@ class CommonTest(unittest.TestCase): return False def _find_all(self): - for cmd in ('aapt', 'adb', 'android', 'zipalign'): + tools = ['aapt', 'adb', 'zipalign'] + if os.path.exists(os.path.join(os.getenv('ANDROID_HOME'), 'tools', 'android')): + tools.append('android') + for cmd in tools: path = fdroidserver.common.find_sdk_tools_cmd(cmd) if path is not None: self.assertTrue(os.path.exists(path)) -- 2.30.2