tests: prefix invocation of ostree with where missing

And add a syntax rule to avoid this in future.

Fixed by:

sed -i -e 's|^ostree |${CMD_PREFIX} ostree |g' tests/*.sh

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

1 files changed, 29 insertions, 29 deletions

diff --git a/tests/test-delta.sh b/tests/test-delta.sh
index ce32a235..2dddefee 100755
--- a/tests/test-delta.sh
+++ b/tests/test-delta.sh
@@ -27,14 +27,14 @@ morebindatafiles="false ls"
 echo '1..3'
 
 mkdir repo
-ostree --repo=repo init --mode=archive-z2
+${CMD_PREFIX} ostree --repo=repo init --mode=archive-z2
 
 mkdir files
 for bin in ${bindatafiles}; do
     cp $(which ${bin}) files
 done
 
-ostree --repo=repo commit -b test -s test --tree=dir=files
+${CMD_PREFIX} ostree --repo=repo commit -b test -s test --tree=dir=files
 
 function permuteFile() {
     permutation=$(($1 % 2))
@@ -79,17 +79,17 @@ get_assert_one_direntry_matching() {
 
 origrev=$(${CMD_PREFIX} ostree --repo=repo rev-parse test)
 
-ostree --repo=repo static-delta generate --empty --to=${origrev}
-ostree --repo=repo static-delta list | grep ${origrev} || exit 1
-ostree --repo=repo prune
-ostree --repo=repo static-delta list | grep ${origrev} || exit 1
+${CMD_PREFIX} ostree --repo=repo static-delta generate --empty --to=${origrev}
+${CMD_PREFIX} ostree --repo=repo static-delta list | grep ${origrev} || exit 1
+${CMD_PREFIX} ostree --repo=repo prune
+${CMD_PREFIX} ostree --repo=repo static-delta list | grep ${origrev} || exit 1
 
 permuteDirectory 1 files
-ostree --repo=repo commit -b test -s test --tree=dir=files
+${CMD_PREFIX} ostree --repo=repo commit -b test -s test --tree=dir=files
 
 newrev=$(${CMD_PREFIX} ostree --repo=repo rev-parse test)
 
-ostree --repo=repo static-delta generate --from=${origrev} --to=${newrev} --inline
+${CMD_PREFIX} ostree --repo=repo static-delta generate --from=${origrev} --to=${newrev} --inline
 
 deltaprefix=$(get_assert_one_direntry_matching repo/deltas '.')
 deltadir=$(get_assert_one_direntry_matching repo/deltas/${deltaprefix} '-')
@@ -97,16 +97,16 @@ deltadir=$(get_assert_one_direntry_matching repo/deltas/${deltaprefix} '-')
 assert_has_file repo/deltas/${deltaprefix}/${deltadir}/superblock
 assert_not_has_file repo/deltas/${deltaprefix}/${deltadir}/0
 
-ostree --repo=repo static-delta generate --from=${origrev} --to=${newrev}
+${CMD_PREFIX} ostree --repo=repo static-delta generate --from=${origrev} --to=${newrev}
 
 assert_has_file repo/deltas/${deltaprefix}/${deltadir}/superblock
 assert_has_file repo/deltas/${deltaprefix}/${deltadir}/0
 
-ostree --repo=repo static-delta generate --disable-bsdiff --from=${origrev} --to=${newrev} 2>&1 | grep "bsdiff=0 objects"
-ostree --repo=repo static-delta generate --max-bsdiff-size=0 --from=${origrev} --to=${newrev} 2>&1 | grep "bsdiff=0 objects"
-ostree --repo=repo static-delta generate --max-bsdiff-size=10000 --from=${origrev} --to=${newrev} 2>&1 | grep "bsdiff=[1-9]"
+${CMD_PREFIX} ostree --repo=repo static-delta generate --disable-bsdiff --from=${origrev} --to=${newrev} 2>&1 | grep "bsdiff=0 objects"
+${CMD_PREFIX} ostree --repo=repo static-delta generate --max-bsdiff-size=0 --from=${origrev} --to=${newrev} 2>&1 | grep "bsdiff=0 objects"
+${CMD_PREFIX} ostree --repo=repo static-delta generate --max-bsdiff-size=10000 --from=${origrev} --to=${newrev} 2>&1 | grep "bsdiff=[1-9]"
 
-ostree --repo=repo static-delta list | grep ${origrev}-${newrev} || exit 1
+${CMD_PREFIX} ostree --repo=repo static-delta list | grep ${origrev}-${newrev} || exit 1
 
 if ${CMD_PREFIX} ostree --repo=repo static-delta generate --from=${origrev} --to=${newrev} --empty 2>>err.txt; then
     assert_not_reached "static-delta generate --from=${origrev} --empty unexpectedly succeeded"
@@ -114,38 +114,38 @@ fi
 
 echo 'ok generate'
 
-mkdir repo2 && ostree --repo=repo2 init --mode=archive-z2
-ostree --repo=repo2 pull-local repo ${newrev}
-ostree --repo=repo2 fsck
-ostree --repo=repo2 ls ${newrev} >/dev/null
+mkdir repo2 && ${CMD_PREFIX} ostree --repo=repo2 init --mode=archive-z2
+${CMD_PREFIX} ostree --repo=repo2 pull-local repo ${newrev}
+${CMD_PREFIX} ostree --repo=repo2 fsck
+${CMD_PREFIX} ostree --repo=repo2 ls ${newrev} >/dev/null
 
 echo 'ok pull delta'
 
 rm repo2 -rf
-mkdir repo2 && ostree --repo=repo2 init --mode=bare-user
+mkdir repo2 && ${CMD_PREFIX} ostree --repo=repo2 init --mode=bare-user
 mkdir deltadir
 
 deltaprefix=$(get_assert_one_direntry_matching repo/deltas '.')
 deltadir=$(get_assert_one_direntry_matching repo/deltas/${deltaprefix} '-')
-ostree --repo=repo2 pull-local repo ${origrev}
-ostree --repo=repo2 ls ${origrev} >/dev/null
-ostree --repo=repo2 static-delta apply-offline repo/deltas/${deltaprefix}/${deltadir}
-ostree --repo=repo2 fsck
-ostree --repo=repo2 ls ${newrev} >/dev/null
+${CMD_PREFIX} ostree --repo=repo2 pull-local repo ${origrev}
+${CMD_PREFIX} ostree --repo=repo2 ls ${origrev} >/dev/null
+${CMD_PREFIX} ostree --repo=repo2 static-delta apply-offline repo/deltas/${deltaprefix}/${deltadir}
+${CMD_PREFIX} ostree --repo=repo2 fsck
+${CMD_PREFIX} ostree --repo=repo2 ls ${newrev} >/dev/null
 
 echo 'ok apply offline'
 
 rm -rf repo/deltas/${deltaprefix}/${deltadir}/*
-ostree --repo=repo static-delta generate --from=${origrev} --to=${newrev} --inline
+${CMD_PREFIX} ostree --repo=repo static-delta generate --from=${origrev} --to=${newrev} --inline
 assert_not_has_file repo/deltas/${deltaprefix}/${deltadir}/0
 
 rm repo2 -rf
 mkdir repo2 && ostree --repo=repo2 init --mode=bare-user
 
-ostree --repo=repo2 pull-local repo ${origrev}
-ostree --repo=repo2 ls ${origrev} >/dev/null
-ostree --repo=repo2 static-delta apply-offline repo/deltas/${deltaprefix}/${deltadir}
-ostree --repo=repo2 fsck
-ostree --repo=repo2 ls ${newrev} >/dev/null
+${CMD_PREFIX} ostree --repo=repo2 pull-local repo ${origrev}
+${CMD_PREFIX} ostree --repo=repo2 ls ${origrev} >/dev/null
+${CMD_PREFIX} ostree --repo=repo2 static-delta apply-offline repo/deltas/${deltaprefix}/${deltadir}
+${CMD_PREFIX} ostree --repo=repo2 fsck
+${CMD_PREFIX} ostree --repo=repo2 ls ${newrev} >/dev/null
 
 echo 'ok apply offline inline'