diff options
| author | Colin Walters <walters@verbum.org> | 2015-06-29 13:35:07 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2015-06-29 13:35:07 -0400 |
| commit | 530631376ea4492c18c76de8e28c4ef08c4db906 (patch) | |
| tree | 75bfc339d13683941523b0ef31b5206059d78590 /tests/test-admin-locking.sh | |
| parent | c8c239f94c9bbe41c959ac448a7a2ca2babf9013 (diff) | |
| download | ostree-530631376ea4492c18c76de8e28c4ef08c4db906.tar.gz | |
tests: Check error messages instead of "expected-fail", handle old parallel
Diffstat (limited to 'tests/test-admin-locking.sh')
| -rw-r--r-- | tests/test-admin-locking.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/test-admin-locking.sh b/tests/test-admin-locking.sh index b6cd7bd9..e416fe78 100644 --- a/tests/test-admin-locking.sh +++ b/tests/test-admin-locking.sh @@ -39,8 +39,13 @@ echo "rev=${rev}" ${CMD_PREFIX} ostree admin --sysroot=sysroot deploy --karg=root=LABEL=MOO --karg=quiet --os=testos testos:testos/buildmaster/x86_64-runtime assert_has_dir sysroot/boot/ostree/testos-${bootcsum} +parallel_cmd=parallel +if parallel --help | grep -q -e --no-notice; then + parallel_cmd="${parallel_cmd} --no-notice" +fi + count=$(($(getconf _NPROCESSORS_ONLN) * 2)) -seq "${count}" | parallel --no-notice -n0 ${CMD_PREFIX} ostree admin --sysroot=sysroot deploy --retain --os=testos testos:testos/buildmaster/x86_64-runtime +seq "${count}" | ${parallel_cmd} -n0 ${CMD_PREFIX} ostree admin --sysroot=sysroot deploy --retain --os=testos testos:testos/buildmaster/x86_64-runtime ${CMD_PREFIX} ostree admin --sysroot=sysroot status > status.txt grep "testos ${rev}" status.txt | wc -l > status-matches.txt |