From 2764c43fa2410eee5572817c27253ed85e74bd6b Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 19 Sep 2017 16:41:50 +0200 Subject: [PATCH] tests: use ci-test-app with current Gradle Android Plugin This works around the gradle 2.x bug where versions newer than 2.9 cannot run things. This also then specifies the version of Gradle Android Plugin that is included in Debian/stretch. --- tests/run-tests | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/run-tests b/tests/run-tests index 27dc651e..b33fa319 100755 --- a/tests/run-tests +++ b/tests/run-tests @@ -177,23 +177,23 @@ $fdroid update #------------------------------------------------------------------------------# -echo_header 'run `fdroid build` in fresh git checkout from import.TestCase' +echo_header 'run "fdroid build" in fresh git checkout from import.TestCase' cd $WORKSPACE/tests/tmp/importer git remote update -p git clean -fdx # stick with known working commit, in case future commits break things for this code -git reset --hard cecf00c08aec56ae7a5eba444150c4d1ae868814 +git reset --hard 985aa135524ab7dd1e70335fd47b22fa628b81b3 if [ -d $ANDROID_HOME/platforms/android-23 ]; then echo "build_tools = '`ls -1 $ANDROID_HOME/build-tools/ | sort -n | tail -1`'" > config.py echo "force_build_tools = True" >> config.py $fdroid build --verbose org.fdroid.ci.test.app:300 else - echo 'WARNING: Skipping `fdroid build` test since android-23 is missing!' + echo 'WARNING: Skipping "fdroid build" test since android-23 is missing!' fi #------------------------------------------------------------------------------# -echo_header 'copy git import and run `fdroid scanner` on it' +echo_header 'copy git import and run "fdroid scanner" on it' REPOROOT=`create_test_dir` cd $REPOROOT -- 2.30.2