summaryrefslogtreecommitdiff
path: root/tests/test-admin-upgrade-not-backwards.sh
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2016-03-02 10:28:04 -0500
committerColin Walters <walters@verbum.org>2016-03-03 08:50:19 -0500
commitd25212f04ac824afff9f45e61be3d8e63be174f2 (patch)
treef9efa0baed1854462db1b4f7b1fd35b96d4edc1b /tests/test-admin-upgrade-not-backwards.sh
parent6d73a620e19dfc982fa08363aed441e0175c8d7b (diff)
downloadostree-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-upgrade-not-backwards.sh')
-rwxr-xr-x[-rw-r--r--]tests/test-admin-upgrade-not-backwards.sh4
1 files changed, 0 insertions, 4 deletions
diff --git a/tests/test-admin-upgrade-not-backwards.sh b/tests/test-admin-upgrade-not-backwards.sh
index 1b99e25d..fd1e1108 100644..100755
--- a/tests/test-admin-upgrade-not-backwards.sh
+++ b/tests/test-admin-upgrade-not-backwards.sh
@@ -21,13 +21,9 @@ 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"
cd ${test_tmpdir}