diff options
| author | Philip Withnall <withnall@endlessm.com> | 2017-08-11 12:33:34 +0100 |
|---|---|---|
| committer | Alexander Larsson <alexander.larsson@gmail.com> | 2017-08-18 14:23:03 +0200 |
| commit | 9989188a1ea7d49e218472cd2f64f0abb24b345e (patch) | |
| tree | 209bf1529b49018e3f58fb57bf3466014ca6d531 /tests/make-test-app.sh | |
| parent | dd63bdbd610b8bec836f4ae4cea98199ba26bdfb (diff) | |
| download | flatpak-9989188a1ea7d49e218472cd2f64f0abb24b345e.tar.gz | |
tests: Add support for collection IDs to test-repo.sh
This adds variable support for collection IDs: they can either be
enabled on the server, on the server and client, or not at all. If
enabled on the server, apps and runtimes are built with collection IDs
and the repository has one set. If enabled on the client, the remote
config is added to the local repository with a collection ID and GPG
verification enabled. They are controlled with
USE_COLLECTIONS_IN_{SERVER,CLIENT}={yes,no}.
These variables are used in the new wrapper tests,
test-repo-collections.sh and test-repo-collections-server-only.sh.
Signed-off-by: Philip Withnall <withnall@endlessm.com>
Diffstat (limited to 'tests/make-test-app.sh')
| -rwxr-xr-x | tests/make-test-app.sh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/tests/make-test-app.sh b/tests/make-test-app.sh index e28a1c0c..10631de0 100755 --- a/tests/make-test-app.sh +++ b/tests/make-test-app.sh @@ -6,6 +6,8 @@ DIR=`mktemp -d` REPONAME=$1 shift +COLLECTION_ID=$1 +shift EXTRA="${1-}" @@ -63,7 +65,13 @@ gzip -c > ${DIR}/files/share/app-info/xmls/org.test.Hello.xml.gz <<EOF EOF cp $(dirname $0)/org.test.Hello.png ${DIR}/files/share/app-info/icons/flatpak/64x64/ +if [ x$COLLECTION_ID != x ]; then + collection_args=--collection-id=${COLLECTION_ID} +else + collection_args= +fi + flatpak build-finish --command=hello.sh ${DIR} mkdir -p repos -flatpak build-export ${GPGARGS-} repos/${REPONAME} ${DIR} +flatpak build-export ${collection_args} ${GPGARGS-} repos/${REPONAME} ${DIR} rm -rf ${DIR} |