tests: Allow specifying app id and app branch for updated apps

This commit is contained in:
Alexander Larsson
2020-06-17 17:22:41 +02:00
committed by Alexander Larsson
parent b5a9903efc
commit 620157ba12
2 changed files with 8 additions and 3 deletions

View File

@@ -371,8 +371,11 @@ make_updated_app () {
COLLECTION_ID=""
fi
BRANCH=${3:-master}
TEXT=${4:-UPDATED}
APP_ID=${5:-""}
RUNTIME_BRANCH=${6:-$BRANCH}
GPGARGS="${GPGARGS:-${FL_GPGARGS}}" $(dirname $0)/make-test-app.sh repos/${REPONAME} "" "${BRANCH}" "${COLLECTION_ID}" ${4:-UPDATED} > /dev/null
RUNTIME_BRANCH=$RUNTIME_BRANCH GPGARGS="${GPGARGS:-${FL_GPGARGS}}" $(dirname $0)/make-test-app.sh repos/${REPONAME} "${APP_ID}" "${BRANCH}" "${COLLECTION_ID}" "${TEXT}" > /dev/null
update_repo $REPONAME "${COLLECTION_ID}"
}

View File

@@ -20,6 +20,8 @@ if [ x$APP_ID = x ]; then
APP_ID=org.test.Hello
fi
RUNTIME_BRANCH=${RUNTIME_BRANCH:-$BRANCH}
EXTRA="${1-}"
ARCH=`flatpak --default-arch`
@@ -28,8 +30,8 @@ ARCH=`flatpak --default-arch`
cat > ${DIR}/metadata <<EOF
[Application]
name=$APP_ID
runtime=org.test.Platform/$ARCH/$BRANCH
sdk=org.test.Platform/$ARCH/$BRANCH
runtime=org.test.Platform/$ARCH/$RUNTIME_BRANCH
sdk=org.test.Platform/$ARCH/$RUNTIME_BRANCH
EOF
if [ x${REQUIRED_VERSION-} != x ]; then