summaryrefslogtreecommitdiff
path: root/tests/test-run.sh
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2018-05-22 10:24:47 +0200
committerAtomic Bot <atomic-devel@projectatomic.io>2018-05-22 08:28:10 +0000
commitfb8122bae25e28f29b694debe2d152c04e32c9f9 (patch)
treec276280c116d78b69f79548643cb70b50ac01396 /tests/test-run.sh
parente28907aeacb0f2d9d0ec65e65593231a91e756a6 (diff)
downloadflatpak-fb8122bae25e28f29b694debe2d152c04e32c9f9.tar.gz
Tests: Ensure that all ostree commits produce valid bare-user-only repos
In particular the non-canonical checks were failing for me due to selinux attributes being picked up. Closes: #1698 Approved by: alexlarsson
Diffstat (limited to 'tests/test-run.sh')
-rwxr-xr-xtests/test-run.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/test-run.sh b/tests/test-run.sh
index 5f498fbf..45f15d33 100755
--- a/tests/test-run.sh
+++ b/tests/test-run.sh
@@ -344,7 +344,8 @@ flatpak build-init app org.test.Writable org.test.Platform org.test.Platform
mkdir -p app/files/a-dir
chmod a+rwx app/files/a-dir
flatpak build-finish --command=hello.sh app
-ostree --repo=repos/test commit ${FL_GPGARGS} --branch=app/org.test.Writable/$ARCH/master app
+# Note: not --canonical-permissions
+ostree --repo=repos/test commit --owner-uid=0 --owner-gid=0 --no-xattrs ${FL_GPGARGS} --branch=app/org.test.Writable/$ARCH/master app
update_repo
${FLATPAK} ${U} install test-repo org.test.Writable
@@ -359,7 +360,8 @@ mkdir -p app/files/
touch app/files/exe
chmod u+s app/files/exe
flatpak build-finish --command=hello.sh app
-ostree --repo=repos/test commit ${FL_GPGARGS} --branch=app/org.test.Setuid/$ARCH/master app
+# Note: not --canonical-permissions
+ostree --repo=repos/test commit --owner-uid=0 --owner-gid=0 --no-xattrs ${FL_GPGARGS} --branch=app/org.test.Setuid/$ARCH/master app
update_repo
if ${FLATPAK} ${U} install test-repo org.test.Setuid &> err2.txt; then