mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-04-03 23:04:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

tests: Call g_test_init() before isolated_test_dir_global_setup()

Browse Source 
g_test_init() is meant to be called before any other use of GTest APIs,
and isolated_test_dir_global_setup() can call g_test_message(). GLib
2.76 makes this more of a practical problem.

(isolated_test_dir_global_setup() is essentially a reimplementation of
G_TEST_OPTION_ISOLATE_DIRS, since we don't depend on GLib 2.60.)

Alternative to https://github.com/flatpak/flatpak/pull/5355.

Signed-off-by: Simon McVittie <smcv@collabora.com>
(cherry picked from commit a058d9617f)
This commit is contained in:
Simon McVittie
2023-03-17 11:55:56 +00:00
parent 1423f0e9bf
commit 9a28eafcc4
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/test-exports.c
View File

@@ -1477,9 +1477,8 @@ main (int argc, char *argv[])
/* Do not call setlocale() here: some tests look at untranslated error
* messages. */
isolated_test_dir_global_setup ();
g_test_init (&argc, &argv, NULL);
isolated_test_dir_global_setup ();
g_test_add_func ("/context/empty", test_empty_context);
g_test_add_func ("/context/filesystems", test_filesystems);

3
tests/test-instance.c
View File

@@ -491,9 +491,8 @@ main (int argc, char *argv[])
{
int res;
isolated_test_dir_global_setup ();
g_test_init (&argc, &argv, NULL);
isolated_test_dir_global_setup ();
g_test_add_func ("/instance/gc", test_gc);
g_test_add_func ("/instance/claim-per-app-temp-directory",