diff options
| author | Phaedrus Leeds <mwleeds@protonmail.com> | 2021-11-15 22:41:18 -0800 |
|---|---|---|
| committer | Alexander Larsson <alexander.larsson@gmail.com> | 2021-11-16 09:53:44 +0100 |
| commit | d23793294d59125e645273d8b3518a9c19b597eb (patch) | |
| tree | e445364f87c4d45f5ae4a101ef6a279181e543c3 /tests/test-run.sh | |
| parent | 403ce7957f7fd418d9efb59dc5f708d2f2b9a041 (diff) | |
| download | flatpak-d23793294d59125e645273d8b3518a9c19b597eb.tar.gz | |
tests: Use ${FLATPAK} not flatpak
This way the flatpak command is more consistently run under valgrind
when that is enabled.
Diffstat (limited to 'tests/test-run.sh')
| -rw-r--r-- | tests/test-run.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/test-run.sh b/tests/test-run.sh index b0b82728..8a67b7d2 100644 --- a/tests/test-run.sh +++ b/tests/test-run.sh @@ -492,10 +492,10 @@ assert_has_file $FL_DIR/app/org.test.OldVersion/$ARCH/stable/active/files/update ok "version checks" rm -rf app -flatpak build-init app org.test.Writable org.test.Platform org.test.Platform stable +${FLATPAK} build-init app org.test.Writable org.test.Platform org.test.Platform stable mkdir -p app/files/a-dir chmod a+rwx app/files/a-dir -flatpak build-finish --command=hello.sh app +${FLATPAK} build-finish --command=hello.sh app # Note: not --canonical-permissions ${FLATPAK} build-export -vv --no-update-summary --disable-sandbox --files=files repos/test app stable ostree --repo=repos/test commit --keep-metadata=xa.metadata --owner-uid=0 --owner-gid=0 --no-xattrs ${FL_GPGARGS} --branch=app/org.test.Writable/$ARCH/stable app @@ -511,11 +511,11 @@ fi ok "no world writable dir" rm -rf app -flatpak build-init app org.test.Setuid org.test.Platform org.test.Platform stable +${FLATPAK} build-init app org.test.Setuid org.test.Platform org.test.Platform stable mkdir -p app/files/ touch app/files/exe chmod u+s app/files/exe -flatpak build-finish --command=hello.sh app +${FLATPAK} build-finish --command=hello.sh app # Note: not --canonical-permissions ${FLATPAK} build-export -vv --no-update-summary --disable-sandbox --files=files repos/test app stable ostree -v --repo=repos/test commit --keep-metadata=xa.metadata --owner-uid=0 --owner-gid=0 --no-xattrs ${FL_GPGARGS} --branch=app/org.test.Setuid/$ARCH/stable app @@ -529,10 +529,10 @@ assert_file_has_content err2.txt [Ii]nvalid ok "no setuid" rm -rf app -flatpak build-init app org.test.App org.test.Platform org.test.Platform stable +${FLATPAK} build-init app org.test.App org.test.Platform org.test.Platform stable mkdir -p app/files/ touch app/files/exe -flatpak build-finish --command=hello.sh --sdk=org.test.Sdk app +${FLATPAK} build-finish --command=hello.sh --sdk=org.test.Sdk app ${FLATPAK} build-export --no-update-summary ${FL_GPGARGS} repos/test app stable update_repo |