From 30f1f158147c90712ce044337a2f312c84873535 Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Sun, 3 Jan 2021 08:50:21 +0100 Subject: [PATCH 1/4] Add missing test files for scanner --- MANIFEST.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/MANIFEST.in b/MANIFEST.in index 064d220e..86f96a8b 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -721,6 +721,7 @@ include tests/source-files/com.nextcloud.client/src/generic/fastlane/metadata/an include tests/source-files/com.nextcloud.client/src/versionDev/fastlane/metadata/android/en-US/full_description.txt include tests/source-files/com.nextcloud.client/src/versionDev/fastlane/metadata/android/en-US/short_description.txt include tests/source-files/com.nextcloud.client/src/versionDev/fastlane/metadata/android/en-US/title.txt +include tests/source-files/com.seafile.seadroid2/app/build.gradle include tests/source-files/eu.siacs.conversations/build.gradle include tests/source-files/eu.siacs.conversations/metadata/en-US/name.txt include tests/source-files/fdroid/fdroidclient/AndroidManifest.xml @@ -729,6 +730,7 @@ include tests/source-files/firebase-suspect/app/build.gradle include tests/source-files/firebase-suspect/build.gradle include tests/source-files/firebase-whitelisted/app/build.gradle include tests/source-files/firebase-whitelisted/build.gradle +include tests/source-files/info.guardianproject.ripple/build.gradle include tests/source-files/open-keychain/open-keychain/build.gradle include tests/source-files/open-keychain/open-keychain/OpenKeychain/build.gradle include tests/source-files/org.mozilla.rocket/app/build.gradle @@ -738,6 +740,8 @@ include tests/source-files/org.tasks/build.gradle.kts include tests/source-files/org.tasks/buildSrc/build.gradle.kts include tests/source-files/org.tasks/settings.gradle.kts include tests/source-files/osmandapp/osmand/build.gradle +include tests/source-files/osmandapp/osmand/gradle/wrapper/gradle-wrapper.properties +include tests/source-files/realm/react-native/android/build.gradle include tests/source-files/se.manyver/android/app/build.gradle include tests/source-files/se.manyver/android/build.gradle include tests/source-files/se.manyver/android/gradle.properties @@ -751,6 +755,7 @@ include tests/source-files/ut.ewh.audiometrytest/app/build.gradle include tests/source-files/ut.ewh.audiometrytest/app/src/main/AndroidManifest.xml include tests/source-files/ut.ewh.audiometrytest/build.gradle include tests/source-files/ut.ewh.audiometrytest/settings.gradle +include tests/source-files/yuriykulikov/AlarmClock/gradle/wrapper/gradle-wrapper.properties include tests/source-files/Zillode/syncthing-silk/build.gradle include tests/SpeedoMeterApp.main_1.apk include tests/stats/known_apks.txt From e789dc4554c3578aacce73fa61f5db9d759a5921 Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Sun, 3 Jan 2021 09:04:13 +0100 Subject: [PATCH 2/4] Sort MANIFEST.in --- MANIFEST.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index 86f96a8b..6836bda4 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -606,6 +606,7 @@ include tests/metadata-rewrite-yml/org.fdroid.fdroid.yml include tests/metadata/souch.smsbypass.yml include tests/metadata.TestCase include tests/minimal_targetsdk_30_unsigned.apk +include tests/Norway_bouvet_europe_2.obf.zip include tests/no_targetsdk_minsdk1_unsigned.apk include tests/no_targetsdk_minsdk30_unsigned.apk include tests/openssl-version-check-test.py @@ -805,7 +806,6 @@ include tests/v2.only.sig_2.apk include tests/valid-package-names/random-package-names include tests/valid-package-names/RandomPackageNames.java include tests/valid-package-names/test.py -include tests/Norway_bouvet_europe_2.obf.zip include tests/xref/metadata/aarddict.android.yml include tests/xref/metadata/org.coolreader.yml include tests/xref/metadata/org.geometerplus.zlibrary.ui.android.yml From ffcf9e7a64100add8c9aa6d0493c3b7c0f272380 Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Sun, 3 Jan 2021 09:04:48 +0100 Subject: [PATCH 3/4] Drop deleted files from MANIFEST.in --- MANIFEST.in | 4 ---- 1 file changed, 4 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 6836bda4..a22fd89e 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -538,7 +538,6 @@ include tests/common.TestCase include tests/complete-ci-tests include tests/config.py include tests/deploy.TestCase -include tests/description-parsing.py include tests/dummy-keystore.jks include tests/dump_internal_metadata_format.py include tests/exception.TestCase @@ -806,6 +805,3 @@ include tests/v2.only.sig_2.apk include tests/valid-package-names/random-package-names include tests/valid-package-names/RandomPackageNames.java include tests/valid-package-names/test.py -include tests/xref/metadata/aarddict.android.yml -include tests/xref/metadata/org.coolreader.yml -include tests/xref/metadata/org.geometerplus.zlibrary.ui.android.yml From 0e312a928b927c545f54be96ad2ef8b000bf7bbf Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Mon, 4 Jan 2021 16:23:13 +0100 Subject: [PATCH 4/4] add missing test files sorted using UNIX `sort` https://gitlab.com/fdroid/fdroidserver/-/merge_requests/842#note_476969121 --- MANIFEST.in | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/MANIFEST.in b/MANIFEST.in index a22fd89e..948d8fc7 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -534,9 +534,11 @@ include tests/build-tools/28.0.3/aapt-output-obb.main.twoversions_1101617.txt include tests/build-tools/28.0.3/aapt-output-souch.smsbypass_9.txt include tests/build-tools/generate.sh include tests/check-fdroid-apk +include tests/checkupdates.TestCase include tests/common.TestCase include tests/complete-ci-tests include tests/config.py +include tests/corrupt-featureGraphic.png include tests/deploy.TestCase include tests/dummy-keystore.jks include tests/dump_internal_metadata_format.py @@ -551,14 +553,18 @@ include tests/gnupghome/random_seed include tests/gnupghome/secring.gpg include tests/gnupghome/trustdb.gpg include tests/gradle-maven-blocks.yaml +include tests/gradle-release-checksums.py include tests/import_proxy.py include tests/import.TestCase include tests/index.TestCase +include tests/init.TestCase include tests/install.TestCase include tests/IsMD5Disabled.java include tests/janus.apk include tests/keystore.jks +include tests/key-tricks.py include tests/lint.TestCase +include tests/main.TestCase include tests/metadata/apk/info.guardianproject.urzip.yaml include tests/metadata/apk/org.dyndns.fules.ck.yaml include tests/metadata/app.with.special.build.params.yml @@ -671,6 +677,7 @@ include tests/repo/patch.1619.obb.mainpatch.current.obb include tests/repo/souch.smsbypass_9.apk include tests/repo/urzip-*.apk include tests/repo/v1.v2.sig_1020.apk +include tests/rewritemeta.TestCase include tests/run-tests include tests/scanner.TestCase include tests/signatures.TestCase @@ -760,6 +767,7 @@ include tests/source-files/Zillode/syncthing-silk/build.gradle include tests/SpeedoMeterApp.main_1.apk include tests/stats/known_apks.txt include tests/testcommon.py +include tests/test-gradlew-fdroid include tests/triple-t-2/build/org.piwigo.android/app/build.gradle include tests/triple-t-2/build/org.piwigo.android/app/.gitignore include tests/triple-t-2/build/org.piwigo.android/app/src/debug/res/values/constants.xml @@ -805,3 +813,4 @@ include tests/v2.only.sig_2.apk include tests/valid-package-names/random-package-names include tests/valid-package-names/RandomPackageNames.java include tests/valid-package-names/test.py +include tests/vcs.TestCase