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

diff --git a/testsuite/a11y/meson.build b/testsuite/a11y/meson.build
index 733f6232176193351f54c9e21353503e6149d116..9129731f36e07ce25b36ffd01597edf7bb546df3 100644 (file)
--- 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 a75b530731ddb758312979e00ae93583c9726c0c..f78d27e372c7d521795b2845c037161476b3bb33 100644 (file)
--- 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 cf4f2f785d4ec3c8478f5031a263e3c7e6bf4c38..746b042203e3ae271d950607fb6fa410b195829e 100644 (file)
--- 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 576b4d8456a947ef98668c7f4d4eb7e82c4b7aef..f682cdbb01cfd9945241c77831b01c3ce85b6af7 100644 (file)
--- 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 a6c5e2edf4132b7c51c8d3a51bc5dc19ee54e33a..7fc4036bfa4c75565ded2dac3372b8fbcd4de4b7 100644 (file)
--- 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 c5f3fdf1ae395c57ec36053757a7c32c7c4ac030..0168b5f6e9c6244404fe58246704a15542f5bda6 100644 (file)
--- 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 a9d7053a2db8363910b004cbdf90d5867624a576..165c9709930670c1ec29d0f19f2b867bcae6c06b 100644 (file)
--- 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 0ee14038283cf4a0d2de09a3ea3336070f8947f9..12b025f3179b18f93475b113e0d2b0e849c2d2b0 100644 (file)
--- 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 35d24758433ace06f0cf8dc7cbf31df2bc37145e..25c2ab06e4af9f7f833b6957f840064d00ba4e30 100644 (file)
--- 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 6de199ac52de11e45795c299ff6f977088adbf98..cf038e6fd1cd4ca723b16c7ded7d59869a97a9fb 100644 (file)
--- 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 341caa9dcaea9aede6d836af9e6d8d2538df1b02..53d99bd5a9ac3d1d747eb34e94c9fa12c4da5b53 100755 (executable)
--- 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 <<EOF
 

diff --git a/testsuite/headless/run-headless-monitor-tests.sh b/testsuite/headless/run-headless-monitor-tests.sh
index 26fd4d03790e1c8bf7b4d0c50a55661a6e5c12c2..70319833cef7361aa663cab84d162922287ac152 100755 (executable)
--- a/testsuite/headless/run-headless-monitor-tests.sh
+++ b/testsuite/headless/run-headless-monitor-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 <<EOF
 

diff --git a/testsuite/meson.build b/testsuite/meson.build
index 8650e918e725ec5a098aeec2d46d9ad02ff66d1d..d44b08a06331492fee1b2e684d0cddea550f1c4c 100644 (file)
--- a/testsuite/meson.build
+++ b/testsuite/meson.build
@@ -4,6 +4,7 @@ installed_test_datadir = join_paths(gtk_datadir, 'installed-tests', 'gtk-4.0')
 
 common_env = [
   'GIO_USE_VOLUME_MONITOR=unix',
+  'GIO_USE_VFS=local',
   'GSETTINGS_BACKEND=memory',
   'GTK_CSD=1',
   'G_ENABLE_DIAGNOSTIC=0',

diff --git a/testsuite/reftests/meson.build b/testsuite/reftests/meson.build
index 793ba19eb76dba40975c82ca111a4e18bafec6e1..7aa049838743a7d7bbf5bdca21e5bd89f5c34809 100644 (file)
--- a/testsuite/reftests/meson.build
+++ b/testsuite/reftests/meson.build
@@ -621,7 +621,6 @@ reftest_env = environment()
 reftest_env.set('GTK_A11Y', 'test')
 reftest_env.set('G_TEST_SRCDIR', meson.current_source_dir())
 reftest_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-reftest_env.set('GIO_USE_VFS', 'local')
 reftest_env.set('GSETTINGS_BACKEND', 'memory')
 reftest_env.set('G_ENABLE_DIAGNOSTIC', '0')
 reftest_env.set('REFTEST_MODULE_DIR', meson.current_build_dir())