packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests: skip tests using gjs/parallel if they are not installed 

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

Closes #131
This commit is contained in:
Giuseppe Scrivano 2015-08-05 16:51:30 +02:00 committed by Colin Walters
parent 8b9effea56
commit 75cdbb8e82
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/test-admin-locking.sh
View File

@ -40,6 +40,9 @@ echo "rev=${rev}"
${CMD_PREFIX} ostree admin deploy --karg=root=LABEL=MOO --karg=quiet --os=testos testos:testos/buildmaster/x86_64-runtime ${CMD_PREFIX} ostree admin deploy --karg=root=LABEL=MOO --karg=quiet --os=testos testos:testos/buildmaster/x86_64-runtime
assert_has_dir sysroot/boot/ostree/testos-${bootcsum} assert_has_dir sysroot/boot/ostree/testos-${bootcsum}
# If parallel is not installed, skip the test
parallel --help >/dev/null 2>&1 || exit 77
parallel_cmd=parallel parallel_cmd=parallel
if parallel --help | grep -q -e --no-notice; then if parallel --help | grep -q -e --no-notice; then
parallel_cmd="${parallel_cmd} --no-notice" parallel_cmd="${parallel_cmd} --no-notice"

3
tests/test-pull-corruption.sh
View File

@ -47,6 +47,9 @@ do_corrupt_pull_test() {
fi fi
} }
# If gjs is not installed, skip the test
gjs --help >/dev/null 2>&1 || exit 77
# FIXME - ignore errors here since gjs in RHEL7 has the final # FIXME - ignore errors here since gjs in RHEL7 has the final
# unrooting bug # unrooting bug
gjs $(dirname $0)/corrupt-repo-ref.js ${repopath} main || true gjs $(dirname $0)/corrupt-repo-ref.js ${repopath} main || true