From f0fb3b64f801cdec7a398cec4abbbf38a2930af4 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 9 Jun 2020 22:22:43 +0200 Subject: [PATCH] remove obselete tests --- MANIFEST.in | 1 - tests/extra/convert_metadata_to_yaml_then_txt.sh | 14 -------------- tests/run-tests | 13 ------------- 3 files changed, 28 deletions(-) delete mode 100755 tests/extra/convert_metadata_to_yaml_then_txt.sh diff --git a/MANIFEST.in b/MANIFEST.in index 4aa37974..ce591656 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -541,7 +541,6 @@ include tests/description-parsing.py include tests/dummy-keystore.jks include tests/dump_internal_metadata_format.py include tests/exception.TestCase -include tests/extra/convert_metadata_to_yaml_then_txt.sh include tests/extra/manual-vmtools-test.py include tests/getsig/getsig.java include tests/getsig/make.sh diff --git a/tests/extra/convert_metadata_to_yaml_then_txt.sh b/tests/extra/convert_metadata_to_yaml_then_txt.sh deleted file mode 100755 index efc03350..00000000 --- a/tests/extra/convert_metadata_to_yaml_then_txt.sh +++ /dev/null @@ -1,14 +0,0 @@ -#! /bin/bash - -if [ ! -d metadata ]; then - echo 'no metadata directory present' - exit 1 -fi - -fdroid rewritemeta --to yml -fdroid rewritemeta --to txt - -echo '## stripping maven, kivy, disable buildflags if they are set to "no"' -sed -i '/^ maven=no$/d' metadata/*.txt -sed -i '/^ kivy=no$/d' metadata/*.txt -sed -i '/^ disable=no$/d' metadata/*.txt diff --git a/tests/run-tests b/tests/run-tests index f3533bd3..6ce7b299 100755 --- a/tests/run-tests +++ b/tests/run-tests @@ -628,19 +628,6 @@ mkdir $REPOROOT/metadata/ cp $WORKSPACE/tests/metadata/org.smssecure.smssecure.yml $REPOROOT/metadata/ $fdroid readmeta -# now make a fake duplicate -touch $REPOROOT/metadata/org.smssecure.smssecure.yml - -set +e -$fdroid readmeta -if [ $? -eq 0 ]; then - echo "This should have failed because there is a duplicate metadata file!" - exit 1 -else - echo "testing duplicate metadata checks passed" -fi -set -e - #------------------------------------------------------------------------------# echo_header "ensure commands that don't need the JDK work without a JDK configed"