deepend/zoitechat
1
0
Fork 0
mirror of https://github.com/ZoiteChat/zoitechat.git synced 2026-06-19 04:49:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Isolate GTK3 settings test data home + use xwayland-run

Browse Source
This commit is contained in:
deepend-tildeclub
2026-06-18 18:57:49 -06:00
parent 944d0f5a70
commit cbc9f68dd6
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packaging/fedora/zoitechat.spec
View File

@@ -16,7 +16,8 @@ BuildRequires: perl-devel
BuildRequires: python3 BuildRequires: python3
BuildRequires: python3-cffi BuildRequires: python3-cffi
BuildRequires: publicsuffix-list BuildRequires: publicsuffix-list
BuildRequires: xorg-x11-server-Xvfb BuildRequires: xwayland-run
BuildRequires: weston
BuildRequires: pkgconfig(ayatana-appindicator3-0.1) BuildRequires: pkgconfig(ayatana-appindicator3-0.1)
BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(gio-2.0) >= 2.36.0 BuildRequires: pkgconfig(gio-2.0) >= 2.36.0
@@ -70,7 +71,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/net.zoite.Zoitechat.d
appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/net.zoite.Zoitechat.appdata.xml appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/net.zoite.Zoitechat.appdata.xml
appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/net.zoite.Zoitechat*.metainfo.xml appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/net.zoite.Zoitechat*.metainfo.xml
xvfb-run -a /usr/bin/meson test -C %{_vpath_builddir} --num-processes %{_smp_build_ncpus} --print-errorlogs \ xwfb-run -- /usr/bin/meson test -C %{_vpath_builddir} --num-processes %{_smp_build_ncpus} --print-errorlogs \
"Theme Manager Dispatch Routing Tests" \ "Theme Manager Dispatch Routing Tests" \
"Validate net.zoite.Zoitechat.desktop" \ "Validate net.zoite.Zoitechat.desktop" \
"Theme GTK3 Settings Tests" \ "Theme GTK3 Settings Tests" \

9
src/fe-gtk/theme/tests/test-theme-gtk3-settings.c
View File

@@ -35,6 +35,7 @@ struct zoitechatprefs prefs;
static gboolean gtk_available; static gboolean gtk_available;
static char *temp_root; static char *temp_root;
static char *xdg_data_home;
static char *theme_parent_root; static char *theme_parent_root;
static char *theme_child_root; static char *theme_child_root;
static char *theme_switch_root; static char *theme_switch_root;
@@ -205,6 +206,10 @@ setup_themes (void)
temp_root = g_dir_make_tmp ("zoitechat-theme-gtk3-settings-XXXXXX", NULL); temp_root = g_dir_make_tmp ("zoitechat-theme-gtk3-settings-XXXXXX", NULL);
g_assert_nonnull (temp_root); g_assert_nonnull (temp_root);
xdg_data_home = g_build_filename (temp_root, "data", NULL);
g_assert_cmpint (g_mkdir_with_parents (xdg_data_home, 0700), ==, 0);
g_setenv ("XDG_DATA_HOME", xdg_data_home, TRUE);
theme_parent_root = g_build_filename (temp_root, "parent", NULL); theme_parent_root = g_build_filename (temp_root, "parent", NULL);
theme_child_root = g_build_filename (temp_root, "child", NULL); theme_child_root = g_build_filename (temp_root, "child", NULL);
theme_switch_root = g_build_filename (temp_root, "switch", NULL); theme_switch_root = g_build_filename (temp_root, "switch", NULL);
@@ -253,10 +258,12 @@ teardown_themes (void)
g_free (theme_parent_root); g_free (theme_parent_root);
g_free (theme_child_root); g_free (theme_child_root);
g_free (theme_switch_root); g_free (theme_switch_root);
g_free (xdg_data_home);
g_free (temp_root); g_free (temp_root);
theme_parent_root = NULL; theme_parent_root = NULL;
theme_child_root = NULL; theme_child_root = NULL;
theme_switch_root = NULL; theme_switch_root = NULL;
xdg_data_home = NULL;
temp_root = NULL; temp_root = NULL;
} }
@@ -328,8 +335,8 @@ main (int argc, char **argv)
int rc; int rc;
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, NULL);
gtk_available = gtk_init_check (&argc, &argv);
setup_themes (); setup_themes ();
gtk_available = gtk_init_check (&argc, &argv);
g_test_add_func ("/theme/gtk3/settings_layer_precedence", test_settings_layer_precedence); g_test_add_func ("/theme/gtk3/settings_layer_precedence", test_settings_layer_precedence);
g_test_add_func ("/theme/gtk3/settings_restored_on_disable_and_switch", test_settings_restored_on_disable_and_switch); g_test_add_func ("/theme/gtk3/settings_restored_on_disable_and_switch", test_settings_restored_on_disable_and_switch);