diff options
| author | Alexander Larsson <alexl@redhat.com> | 2020-10-15 18:28:33 +0200 |
|---|---|---|
| committer | Alexander Larsson <alexander.larsson@gmail.com> | 2020-10-29 15:30:35 +0100 |
| commit | 3169fa58edf3a356057346faab29ae94d636bcd4 (patch) | |
| tree | ee4e7c18ef439377ce35df940f1add1eef599eed /tests/test-unused.sh | |
| parent | 3d65276f7977ad77b81abd9b5187037d192dd44d (diff) | |
| download | flatpak-3169fa58edf3a356057346faab29ae94d636bcd4.tar.gz | |
tests: Convert some flatpak calls to $FLATPAK
This allows these to run under valgrind when testing in valgrind.
Diffstat (limited to 'tests/test-unused.sh')
| -rwxr-xr-x | tests/test-unused.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/test-unused.sh b/tests/test-unused.sh index 3cb79865..5bd359a8 100755 --- a/tests/test-unused.sh +++ b/tests/test-unused.sh @@ -32,7 +32,7 @@ echo "1..2" setup_empty_repo &> /dev/null > /dev/null # Manually add the user remote too -flatpak remote-add --user --gpg-import=${FL_GPG_HOMEDIR}/pubring.gpg test-repo "http://127.0.0.1:${port}/test" +$FLATPAK remote-add --user --gpg-import=${FL_GPG_HOMEDIR}/pubring.gpg test-repo "http://127.0.0.1:${port}/test" # This tests the detection of unused refs. Used refs are any that have @@ -83,8 +83,8 @@ sdk=${SDK}/$ARCH/$BRANCH EOF fi - flatpak build-finish $DIR ${finish_args[$ID]:-} &> /dev/null > /dev/null - flatpak build-export ${FL_GPGARGS} --disable-sandbox --runtime repos/test ${DIR} ${BRANCH} &> /dev/null > /dev/null + $FLATPAK build-finish $DIR ${finish_args[$ID]:-} &> /dev/null > /dev/null + $FLATPAK build-export -v ${FL_GPGARGS} --disable-sandbox --runtime repos/test ${DIR} ${BRANCH} &> /dev/null > /dev/null rm -rf ${DIR} } @@ -110,9 +110,9 @@ EOF fi set -x - flatpak build-finish ${DIR} ${finish_args[$ID]:-} &> /dev/null > /dev/null + $FLATPAK build-finish ${DIR} ${finish_args[$ID]:-} &> /dev/null > /dev/null - flatpak build-export ${FL_GPGARGS} --disable-sandbox repos/test ${DIR} ${BRANCH} &> /dev/null > /dev/null + $FLATPAK build-export ${FL_GPGARGS} --disable-sandbox repos/test ${DIR} ${BRANCH} &> /dev/null > /dev/null rm -rf ${DIR} } |