From 53bebd2ed1e50b12031c2ccff9b5e9a492b82c07 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Fri, 9 Jun 2023 02:26:18 +0200 Subject: [PATCH] testsuite: Set GIO_USE_VFS=local everywhere And do so centrally, not randomly in individual tests. (Hopefully) fixes spurious test failures in CI. Related: #5867 --- testsuite/a11y/meson.build | 1 - testsuite/css/change/meson.build | 1 - testsuite/css/meson.build | 1 - testsuite/css/nodes/meson.build | 1 - testsuite/css/style/meson.build | 1 - testsuite/gtk/accessor-apis.c | 1 - testsuite/gtk/defaultvalue.c | 1 - testsuite/gtk/meson.build | 1 - testsuite/gtk/objects-finalize.c | 1 - testsuite/gtk/templates.c | 1 - testsuite/headless/run-headless-input-tests.sh | 1 - testsuite/headless/run-headless-monitor-tests.sh | 1 - testsuite/meson.build | 1 + testsuite/reftests/meson.build | 1 - 14 files changed, 1 insertion(+), 13 deletions(-) diff --git a/testsuite/a11y/meson.build b/testsuite/a11y/meson.build index 733f623217..9129731f36 100644 --- a/testsuite/a11y/meson.build +++ b/testsuite/a11y/meson.build @@ -48,7 +48,6 @@ test_env.set('GTK_A11Y', 'test') test_env.set('GSK_RENDERER', 'cairo') test_env.set('G_TEST_SRCDIR', meson.current_source_dir()) test_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) -test_env.set('GIO_USE_VFS', 'local') test_env.set('GSETTINGS_BACKEND', 'memory') test_env.set('G_ENABLE_DIAGNOSTIC', '0') diff --git a/testsuite/css/change/meson.build b/testsuite/css/change/meson.build index a75b530731..f78d27e372 100644 --- a/testsuite/css/change/meson.build +++ b/testsuite/css/change/meson.build @@ -3,7 +3,6 @@ changetest_env.set('GTK_A11Y', 'test') changetest_env.set('GSK_RENDERER', 'cairo') changetest_env.set('G_TEST_SRCDIR', meson.current_source_dir()) changetest_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) -changetest_env.set('GIO_USE_VFS', 'local') changetest_env.set('GSETTINGS_BACKEND', 'memory') changetest_env.set('G_ENABLE_DIAGNOSTIC', '0') diff --git a/testsuite/css/meson.build b/testsuite/css/meson.build index cf4f2f785d..746b042203 100644 --- a/testsuite/css/meson.build +++ b/testsuite/css/meson.build @@ -3,7 +3,6 @@ csstest_env.set('GTK_A11Y', 'test') csstest_env.set('GSK_RENDERER', 'cairo') csstest_env.set('G_TEST_SRCDIR', meson.current_source_dir()) csstest_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) -csstest_env.set('GIO_USE_VFS', 'local') csstest_env.set('GSETTINGS_BACKEND', 'memory') csstest_env.set('G_ENABLE_DIAGNOSTIC', '0') csstest_env.set('GDK_DEBUG', 'default-settings') diff --git a/testsuite/css/nodes/meson.build b/testsuite/css/nodes/meson.build index 576b4d8456..f682cdbb01 100644 --- a/testsuite/css/nodes/meson.build +++ b/testsuite/css/nodes/meson.build @@ -3,7 +3,6 @@ nodetest_env.set('GTK_A11Y', 'test') nodetest_env.set('GSK_RENDERER', 'cairo') nodetest_env.set('G_TEST_SRCDIR', meson.current_source_dir()) nodetest_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) -nodetest_env.set('GIO_USE_VFS', 'local') nodetest_env.set('GSETTINGS_BACKEND', 'memory') nodetest_env.set('G_ENABLE_DIAGNOSTIC', '0') diff --git a/testsuite/css/style/meson.build b/testsuite/css/style/meson.build index a6c5e2edf4..7fc4036bfa 100644 --- a/testsuite/css/style/meson.build +++ b/testsuite/css/style/meson.build @@ -3,7 +3,6 @@ styletest_env.set('GTK_A11Y', 'test') styletest_env.set('GSK_RENDERER', 'cairo') styletest_env.set('G_TEST_SRCDIR', meson.current_source_dir()) styletest_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) -styletest_env.set('GIO_USE_VFS', 'local') styletest_env.set('GSETTINGS_BACKEND', 'memory') styletest_env.set('G_ENABLE_DIAGNOSTIC', '0') diff --git a/testsuite/gtk/accessor-apis.c b/testsuite/gtk/accessor-apis.c index c5f3fdf1ae..0168b5f6e9 100644 --- a/testsuite/gtk/accessor-apis.c +++ b/testsuite/gtk/accessor-apis.c @@ -322,7 +322,6 @@ main (int argc, char **argv) int result; /* These must be set before before gtk_test_init */ - g_setenv ("GIO_USE_VFS", "local", TRUE); g_setenv ("GSETTINGS_BACKEND", "memory", TRUE); /* initialize test program */ diff --git a/testsuite/gtk/defaultvalue.c b/testsuite/gtk/defaultvalue.c index a9d7053a2d..165c970993 100644 --- a/testsuite/gtk/defaultvalue.c +++ b/testsuite/gtk/defaultvalue.c @@ -510,7 +510,6 @@ main (int argc, char **argv) const char *display, *x_r_d; /* These must be set before gtk_test_init */ - g_setenv ("GIO_USE_VFS", "local", TRUE); g_setenv ("GSETTINGS_BACKEND", "memory", TRUE); g_setenv ("G_ENABLE_DIAGNOSTIC", "0", TRUE); diff --git a/testsuite/gtk/meson.build b/testsuite/gtk/meson.build index 0ee1403828..12b025f317 100644 --- a/testsuite/gtk/meson.build +++ b/testsuite/gtk/meson.build @@ -139,7 +139,6 @@ test_env.set('GTK_A11Y', 'test') test_env.set('GSK_RENDERER', 'cairo') test_env.set('G_TEST_SRCDIR', meson.current_source_dir()) test_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) -test_env.set('GIO_USE_VFS', 'local') test_env.set('GSETTINGS_BACKEND', 'memory') test_env.set('G_ENABLE_DIAGNOSTIC', '0') diff --git a/testsuite/gtk/objects-finalize.c b/testsuite/gtk/objects-finalize.c index 35d2475843..25c2ab06e4 100644 --- a/testsuite/gtk/objects-finalize.c +++ b/testsuite/gtk/objects-finalize.c @@ -142,7 +142,6 @@ main (int argc, char **argv) const char *display, *x_r_d; /* These must be set before gtk_test_init */ - g_setenv ("GIO_USE_VFS", "local", TRUE); g_setenv ("GSETTINGS_BACKEND", "memory", TRUE); /* g_test_dbus_up() helpfully clears these, so we have to re-set it */ diff --git a/testsuite/gtk/templates.c b/testsuite/gtk/templates.c index 6de199ac52..cf038e6fd1 100644 --- a/testsuite/gtk/templates.c +++ b/testsuite/gtk/templates.c @@ -425,7 +425,6 @@ int main (int argc, char **argv) { /* These must be set before gtk_test_init */ - g_setenv ("GIO_USE_VFS", "local", TRUE); g_setenv ("GSETTINGS_BACKEND", "memory", TRUE); /* initialize test program */ diff --git a/testsuite/headless/run-headless-input-tests.sh b/testsuite/headless/run-headless-input-tests.sh index 341caa9dca..53d99bd5a9 100755 --- a/testsuite/headless/run-headless-input-tests.sh +++ b/testsuite/headless/run-headless-input-tests.sh @@ -8,7 +8,6 @@ mkdir -p ${outputdir} export GTK_A11Y=none -export GIO_USE_VFS=local dbus-run-session sh 2>${outputdir}/dbus-stderr.log <${outputdir}/dbus-stderr.log <