diff options
| author | Colin Walters <walters@verbum.org> | 2016-03-02 10:28:04 -0500 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2016-03-03 08:50:19 -0500 |
| commit | d25212f04ac824afff9f45e61be3d8e63be174f2 (patch) | |
| tree | f9efa0baed1854462db1b4f7b1fd35b96d4edc1b /tests/test-admin-deploy-2.sh | |
| parent | 6d73a620e19dfc982fa08363aed441e0175c8d7b (diff) | |
| download | ostree-d25212f04ac824afff9f45e61be3d8e63be174f2.tar.gz | |
tests: Port to glib-tap.mk, make `make check` run all of the tests
OSTree's code for testing predates the `glib-tap.mk` making its
way into GLib. Let's switch to it, as it provides a number
of advantages.
By far the biggest advantage is that `make check` can start to run
most of the tests *in addition* to having them work installed.
This commit keeps the installed tests working, but `make check` turns
out to be really broken because...our TAP usage has bitrotted to say
the least. Fix that all up.
Do some hacks so that the tests work uninstalled as well - in
particular, `glib-tap.mk` and the bits encoded into
`g_test_build_filename()` assume *recursive* Automake (blah). Work
around that by creating a symlink when installed to loop back.
Diffstat (limited to 'tests/test-admin-deploy-2.sh')
| -rwxr-xr-x | tests/test-admin-deploy-2.sh | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tests/test-admin-deploy-2.sh b/tests/test-admin-deploy-2.sh index ef6b5953..79e253bb 100755 --- a/tests/test-admin-deploy-2.sh +++ b/tests/test-admin-deploy-2.sh @@ -21,14 +21,10 @@ set -euo pipefail . $(dirname $0)/libtest.sh -echo "1..1" - # Exports OSTREE_SYSROOT so --sysroot not needed. setup_os_repository "archive-z2" "syslinux" -echo "ok setup" - -echo "1..2" +echo "1..3" ${CMD_PREFIX} ostree --repo=sysroot/ostree/repo pull-local --remote=testos testos-repo testos/buildmaster/x86_64-runtime rev=$(${CMD_PREFIX} ostree --repo=sysroot/ostree/repo rev-parse testos/buildmaster/x86_64-runtime) |