Merge pull request #213 from jlebon/pr/mutable-deployments

tests: make ostree use mutable deployments
This commit is contained in:
Colin Walters 2016-02-19 12:48:16 -05:00
commit a09ba2c9aa
2 changed files with 8 additions and 0 deletions

View File

@ -22,6 +22,10 @@ test_tmpdir=$(pwd)
export G_DEBUG=fatal-warnings export G_DEBUG=fatal-warnings
# Don't flag deployments as immutable so that test harnesses can
# easily clean up.
export OSTREE_SYSROOT_DEBUG=mutable-deployments
export TEST_GPG_KEYID="472CDAFA" export TEST_GPG_KEYID="472CDAFA"
export TEST_GPG_KEYHOME=${SRCDIR}/gpghome export TEST_GPG_KEYHOME=${SRCDIR}/gpghome
export OSTREE_GPG_HOME=${TEST_GPG_KEYHOME}/trusted export OSTREE_GPG_HOME=${TEST_GPG_KEYHOME}/trusted

View File

@ -57,4 +57,8 @@ EOF
export RPMOSTREE_USE_SESSION_BUS=1 export RPMOSTREE_USE_SESSION_BUS=1
# Don't flag deployments as immutable so that test harnesses can
# easily clean up.
export OSTREE_SYSROOT_DEBUG=mutable-deployments
exec @installed_testdir@/dbus-run-session --config-file=${test_tmpdir}/session.conf $@ exec @installed_testdir@/dbus-run-session --config-file=${test_tmpdir}/session.conf $@