[gnome-shell/wip/fmuellner/test-theme: 11/12] test-theme: Change presumed CWD



commit beb3cd98a27481a40729331e67fbbcd18109a80c
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 2548ca203..0d6acd135 100644
--- a/src/st/test-theme.c
+++ b/src/st/test-theme.c
@@ -411,15 +411,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
@@ -545,7 +545,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]