[gnome-shell/wip/fmuellner/test-theme: 2/3] test-theme: Change presumed CWD
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/wip/fmuellner/test-theme: 2/3] test-theme: Change presumed CWD
- Date: Tue, 26 Feb 2019 01:53:22 +0000 (UTC)
commit e887fb96585afdf5fe69d8bbd0841f8bc5aefe24
Author: Florian Müllner <fmuellner gnome org>
Date: Tue Feb 26 01:57:01 2019 +0100
test-theme: Change presumed CWD
The executable is assumed to be run from $top_srcdir/src, which is
essentially an autotools left-over (it's where the program ended
up with srcdir == builddir).
Now with meson, its actual srcdir makes more senses.
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/419
src/st/test-theme.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/st/test-theme.c b/src/st/test-theme.c
index 40a9e6d98..0378f6be9 100644
--- a/src/st/test-theme.c
+++ b/src/st/test-theme.c
@@ -410,15 +410,15 @@ test_background (void)
test = "background";
/* group1 has a background: shortcut property setting color and image */
assert_background_color (group1, "group1", 0xff0000ff);
- assert_background_image (group1, "group1", "st/some-background.png");
+ assert_background_image (group1, "group1", "some-background.png");
/* text1 inherits the background image but not the color */
assert_background_color (text1, "text1", 0x00000000);
- assert_background_image (text1, "text1", "st/some-background.png");
+ assert_background_image (text1, "text1", "some-background.png");
/* text2 inherits both, but then background: none overrides both */
assert_background_color (text2, "text2", 0x00000000);
assert_background_image (text2, "text2", NULL);
/* background-image property */
- assert_background_image (group2, "group2", "st/other-background.png");
+ assert_background_image (group2, "group2", "other-background.png");
}
static void
@@ -544,7 +544,7 @@ main (int argc, char **argv)
/* Make sure our assumptions about resolution are correct */
g_object_set (clutter_settings_get_default (), "font-dpi", -1, NULL);
- file = g_file_new_for_path ("st/test-theme.css");
+ file = g_file_new_for_path ("test-theme.css");
theme = st_theme_new (file, NULL, NULL);
g_object_unref (file);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]