flatpak/trunk/0002-tests-Don-t-use-g_test_message-before-g_test_init.patch

   1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
   2 From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
   3 Date: Fri, 17 Mar 2023 02:08:38 +0100
   4 Subject: [PATCH] tests: Don't use g_test_message before g_test_init
   5
   6 Meson will fail a test using TAP if the first line on stdout isn't the
   7 TAP version declaration.
   8 ---
   9  tests/testlib.c | 14 +++++++-------
  10  1 file changed, 7 insertions(+), 7 deletions(-)
  11
  12 diff --git a/tests/testlib.c b/tests/testlib.c
  13 index 41f27ac9f541..d51cec375bf6 100644
  14 --- a/tests/testlib.c
  15 +++ b/tests/testlib.c
  16 @@ -50,38 +50,38 @@ isolated_test_dir_global_setup (void)
  17
  18    isolated_test_dir = g_strdup ("/tmp/flatpak-test-XXXXXX");
  19    assert_mkdtemp (isolated_test_dir);
  20 -  g_test_message ("isolated_test_dir: %s", isolated_test_dir);
  21 +  g_printerr ("isolated_test_dir: %s\n", isolated_test_dir);
  22
  23    homedir = g_strconcat (isolated_test_dir, "/home", NULL);
  24    g_assert_no_errno (g_mkdir_with_parents (homedir, S_IRWXU | S_IRWXG | S_IRWXO));
  25
  26    g_setenv ("HOME", homedir, TRUE);
  27 -  g_test_message ("setting HOME=%s", homedir);
  28 +  g_printerr ("setting HOME=%s\n", homedir);
  29
  30    cachedir = g_strconcat (isolated_test_dir, "/home/cache", NULL);
  31    g_assert_no_errno (g_mkdir_with_parents (cachedir, S_IRWXU | S_IRWXG | S_IRWXO));
  32    g_setenv ("XDG_CACHE_HOME", cachedir, TRUE);
  33 -  g_test_message ("setting XDG_CACHE_HOME=%s", cachedir);
  34 +  g_printerr ("setting XDG_CACHE_HOME=%s\n", cachedir);
  35
  36    configdir = g_strconcat (isolated_test_dir, "/home/config", NULL);
  37    g_assert_no_errno (g_mkdir_with_parents (configdir, S_IRWXU | S_IRWXG | S_IRWXO));
  38    g_setenv ("XDG_CONFIG_HOME", configdir, TRUE);
  39 -  g_test_message ("setting XDG_CONFIG_HOME=%s", configdir);
  40 +  g_printerr ("setting XDG_CONFIG_HOME=%s\n", configdir);
  41
  42    datadir = g_strconcat (isolated_test_dir, "/home/share", NULL);
  43    g_assert_no_errno (g_mkdir_with_parents (datadir, S_IRWXU | S_IRWXG | S_IRWXO));
  44    g_setenv ("XDG_DATA_HOME", datadir, TRUE);
  45 -  g_test_message ("setting XDG_DATA_HOME=%s", datadir);
  46 +  g_printerr ("setting XDG_DATA_HOME=%s\n", datadir);
  47
  48    statedir = g_strconcat (isolated_test_dir, "/home/state", NULL);
  49    g_assert_no_errno (g_mkdir_with_parents (statedir, S_IRWXU | S_IRWXG | S_IRWXO));
  50    g_setenv ("XDG_STATE_HOME", statedir, TRUE);
  51 -  g_test_message ("setting XDG_STATE_HOME=%s", statedir);
  52 +  g_printerr ("setting XDG_STATE_HOME=%s\n", statedir);
  53
  54    runtimedir = g_strconcat (isolated_test_dir, "/runtime", NULL);
  55    g_assert_no_errno (g_mkdir_with_parents (runtimedir, S_IRWXU));
  56    g_setenv ("XDG_RUNTIME_DIR", runtimedir, TRUE);
  57 -  g_test_message ("setting XDG_RUNTIME_DIR=%s", runtimedir);
  58 +  g_printerr ("setting XDG_RUNTIME_DIR=%s\n", runtimedir);
  59
  60    g_reload_user_special_dirs_cache ();
  61