diff options
author | Lionir <git@thelion.website> | 2021-10-11 17:51:59 -0400 |
---|---|---|
committer | Alexander Larsson <alexander.larsson@gmail.com> | 2021-11-15 11:07:57 +0100 |
commit | 0fda062c96a44a78ac0480da5e270ea60c837fe6 (patch) | |
tree | b4041e73d850f4cb1bb9e28158cc690cdda16eea /tests/testlib.c | |
parent | 17fbe516c4251c08a648f5e938af3af78fbd4ab4 (diff) | |
download | flatpak-0fda062c96a44a78ac0480da5e270ea60c837fe6.tar.gz |
Add XDG_STATE_HOME and HOST_XDG_STATE_HOME env variables
This gives new support for the new XDG_STATE_HOME addition to XDG_BASE_DIRS
which allows applications to use this without breaking because they would
assume $HOME/.local/state which may be unavailable to the flatpak
This adds it as .local/state as to make --persist=.local/state the same behaviour
as in new flatpak. This in turn means that the transition should be seamless between
old and new flatpak.
This also has the benefit of working if the application doesn't follow XDG spec thanks
to --persist=.local/state.
This fixes https://github.com/flatpak/flatpak/issues/4477
[smcv: Don't call nonexistent g_get_user_state_dir(); fix a reference
to XDG_STATE_DIR]
Diffstat (limited to 'tests/testlib.c')
-rw-r--r-- | tests/testlib.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/testlib.c b/tests/testlib.c index 28c97a4d..1e5d9428 100644 --- a/tests/testlib.c +++ b/tests/testlib.c @@ -44,6 +44,7 @@ isolated_test_dir_global_setup (void) g_autofree char *cachedir = NULL; g_autofree char *configdir = NULL; g_autofree char *datadir = NULL; + g_autofree char *statedir = NULL; g_autofree char *homedir = NULL; g_autofree char *runtimedir = NULL; @@ -72,6 +73,11 @@ isolated_test_dir_global_setup (void) g_setenv ("XDG_DATA_HOME", datadir, TRUE); g_test_message ("setting XDG_DATA_HOME=%s", datadir); + statedir = g_strconcat (isolated_test_dir, "/home/state", NULL); + g_assert_no_errno (g_mkdir_with_parents (statedir, S_IRWXU | S_IRWXG | S_IRWXO)); + g_setenv ("XDG_STATE_HOME", statedir, TRUE); + g_test_message ("setting XDG_STATE_HOME=%s", statedir); + runtimedir = g_strconcat (isolated_test_dir, "/runtime", NULL); g_assert_no_errno (g_mkdir_with_parents (runtimedir, S_IRWXU)); g_setenv ("XDG_RUNTIME_DIR", runtimedir, TRUE); @@ -82,6 +88,7 @@ isolated_test_dir_global_setup (void) g_assert_cmpstr (g_get_user_cache_dir (), ==, cachedir); g_assert_cmpstr (g_get_user_config_dir (), ==, configdir); g_assert_cmpstr (g_get_user_data_dir (), ==, datadir); + g_assert_cmpstr (g_getenv ("XDG_STATE_HOME"), ==, statedir); g_assert_cmpstr (g_get_user_runtime_dir (), ==, runtimedir); } |