From 75cdbb8e82589ed99b00e1acf0f54e58797dd9e6 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 5 Aug 2015 16:51:30 +0200 Subject: [PATCH] tests: skip tests using gjs/parallel if they are not installed Signed-off-by: Giuseppe Scrivano Closes #131 --- tests/test-admin-locking.sh | 3 +++ tests/test-pull-corruption.sh | 3 +++ 2 files changed, 6 insertions(+) diff --git a/tests/test-admin-locking.sh b/tests/test-admin-locking.sh index b82fd5c3..6b432202 100644 --- a/tests/test-admin-locking.sh +++ b/tests/test-admin-locking.sh @@ -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 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 if parallel --help | grep -q -e --no-notice; then parallel_cmd="${parallel_cmd} --no-notice" diff --git a/tests/test-pull-corruption.sh b/tests/test-pull-corruption.sh index 7e4055c1..e81e4229 100755 --- a/tests/test-pull-corruption.sh +++ b/tests/test-pull-corruption.sh @@ -47,6 +47,9 @@ do_corrupt_pull_test() { 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 # unrooting bug gjs $(dirname $0)/corrupt-repo-ref.js ${repopath} main || true