diff options
Diffstat (limited to 'tests/libtest.sh')
-rw-r--r-- | tests/libtest.sh | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/tests/libtest.sh b/tests/libtest.sh index 2bbc592..4180de7 100644 --- a/tests/libtest.sh +++ b/tests/libtest.sh @@ -30,8 +30,6 @@ else test_builddir=$(dirname $0) fi -export U=${U-"--user"} - assert_not_reached () { echo $@ 1>&2; exit 1 } @@ -71,12 +69,25 @@ fi # We need this to be in /var/tmp because /tmp has no xattr support TEST_DATA_DIR=`mktemp -d /var/tmp/test-flatpak-XXXXXX` +mkdir -p ${TEST_DATA_DIR}/home +mkdir -p ${TEST_DATA_DIR}/system +export FLATPAK_SYSTEM_DIR=${TEST_DATA_DIR}/system +export FLATPAK_SYSTEM_HELPER_ON_SESSION=1 -export XDG_DATA_HOME=${TEST_DATA_DIR}/share +export XDG_DATA_HOME=${TEST_DATA_DIR}/home/share -export USERDIR=${TEST_DATA_DIR}/share/flatpak +export USERDIR=${TEST_DATA_DIR}/home/share/flatpak +export SYSTEMDIR=${TEST_DATA_DIR}/system export ARCH=`flatpak --default-arch` +if [ x${USE_SYSTEMDIR-} == xyes ] ; then + export FL_DIR=${SYSTEMDIR} + export U= +else + export FL_DIR=${USERDIR} + export U="--user" +fi + export FLATPAK="${CMD_PREFIX} flatpak" assert_streq () { |