[gtk/kill-popup-windows: 5/13] wip: temporarily disable file transfer portal in tests
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/kill-popup-windows: 5/13] wip: temporarily disable file transfer portal in tests
- Date: Thu, 9 Jan 2020 04:00:20 +0000 (UTC)
commit 6a8aff2fef4ba587000f560bec23eb4fe2ea7db4
Author: Matthias Clasen <mclasen redhat com>
Date: Mon Dec 30 15:34:00 2019 -0500
wip: temporarily disable file transfer portal in tests
There is a problem with the testdbus instance that some
of our tests set up - trying to call into it hangs.
gdk/filetransferportal.c | 3 +++
testsuite/gtk/meson.build | 1 +
2 files changed, 4 insertions(+)
---
diff --git a/gdk/filetransferportal.c b/gdk/filetransferportal.c
index 382c8bd299..ae1057488c 100644
--- a/gdk/filetransferportal.c
+++ b/gdk/filetransferportal.c
@@ -86,6 +86,9 @@ file_transfer_portal_available (void)
{
gboolean available;
+ if (g_getenv ("NO_FILE_TRANSFER_PORTAL"))
+ return FALSE;
+
ensure_file_transfer_portal ();
available = file_transfer_proxy != NULL;
diff --git a/testsuite/gtk/meson.build b/testsuite/gtk/meson.build
index 2b5db62892..4c8b2ca36a 100644
--- a/testsuite/gtk/meson.build
+++ b/testsuite/gtk/meson.build
@@ -99,6 +99,7 @@ foreach t : tests
'GTK_CSD=1',
'G_ENABLE_DIAGNOSTIC=0',
'GSK_RENDERER=cairo',
+ 'NO_FILE_TRANSFER_PORTAL=1',
'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()),
'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()),
'GSETTINGS_SCHEMA_DIR=@0@'.format(gtk_schema_build_dir),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]