From 2cfeef6bcca7bf03dc954bede6c599ed35573945 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 31 Aug 2017 13:41:35 +0100 Subject: [PATCH] Put FLATPAK_SYSTEM_CACHE_DIR alongside other test data This makes it easier to reason about. In the absence of FLATPAK_SYSTEM_CACHE_DIR, it would use /var/tmp even during tests that prefer /tmp. Signed-off-by: Simon McVittie --- tests/libtest.sh | 1 + tests/testlibrary.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/tests/libtest.sh b/tests/libtest.sh index b929745f..14952e4b 100644 --- a/tests/libtest.sh +++ b/tests/libtest.sh @@ -77,6 +77,7 @@ mkdir -p ${TEST_DATA_DIR}/home mkdir -p ${TEST_DATA_DIR}/runtime mkdir -p ${TEST_DATA_DIR}/system export FLATPAK_SYSTEM_DIR=${TEST_DATA_DIR}/system +export FLATPAK_SYSTEM_CACHE_DIR=${TEST_DATA_DIR}/system-cache export FLATPAK_SYSTEM_HELPER_ON_SESSION=1 export HOME=${TEST_DATA_DIR}/home diff --git a/tests/testlibrary.c b/tests/testlibrary.c index 1656b692..fbba1971 100644 --- a/tests/testlibrary.c +++ b/tests/testlibrary.c @@ -12,6 +12,7 @@ static char *testdir; static char *flatpak_runtimedir; static char *flatpak_systemdir; +static char *flatpak_systemcachedir; static char *flatpak_configdir; static char *flatpak_installationsdir; static char *gpg_homedir; @@ -832,6 +833,11 @@ global_setup (void) g_setenv ("FLATPAK_SYSTEM_DIR", flatpak_systemdir, TRUE); g_test_message ("setting FLATPAK_SYSTEM_DIR=%s", flatpak_systemdir); + flatpak_systemcachedir = g_strconcat (testdir, "/system-cache", NULL); + g_mkdir_with_parents (flatpak_systemcachedir, S_IRWXU|S_IRWXG|S_IRWXO); + g_setenv ("FLATPAK_SYSTEM_CACHE_DIR", flatpak_systemcachedir, TRUE); + g_test_message ("setting FLATPAK_SYSTEM_CACHE_DIR=%s", flatpak_systemcachedir); + flatpak_configdir = g_strconcat (testdir, "/config", NULL); g_mkdir_with_parents (flatpak_configdir, S_IRWXU|S_IRWXG|S_IRWXO); g_setenv ("FLATPAK_CONFIG_DIR", flatpak_configdir, TRUE);