Prepare the stylecontext test to run out-of-srcdir

This is necessary to make distcheck work.

diff --git a/gtk/tests/Makefile.am b/gtk/tests/Makefile.am
index dda9727d49ae3430369d46f12d2d9c64fc79eca9..186880b11c7b5fd7c22b350e0a4afca9f080edb3 100644 (file)
--- a/gtk/tests/Makefile.am
+++ b/gtk/tests/Makefile.am
@@ -6,6 +6,7 @@ INCLUDES = \
        -I$(top_srcdir)/gdk             \
        -DGDK_DISABLE_DEPRECATED        \
        -DGTK_DISABLE_DEPRECATED        \
+       -DSRCDIR=\""$(abs_srcdir)"\"    \
        $(GTK_DEBUG_FLAGS)              \
        $(GTK_DEP_CFLAGS)
 

diff --git a/gtk/tests/stylecontext.c b/gtk/tests/stylecontext.c
index 20b7dadfc944b743b2ca741d54576815679ce971..54141edd99ed2e787e85ea9d37452b10ec59910e 100644 (file)
--- a/gtk/tests/stylecontext.c
+++ b/gtk/tests/stylecontext.c
@@ -26,11 +26,11 @@ test_parse_at (void)
   gboolean res;
   gint i;
   const gchar *valid[] = {
-    "@import \"test.css\";",
-    "@import 'test.css';",
-    "@import url(\"test.css\");",
-    "@import url('test.css');",
-    "@import\nurl (\t\"test.css\" ) ;",
+    "@import \"" SRCDIR "/test.css\";",
+    "@import '" SRCDIR "/test.css';",
+    "@import url(\"" SRCDIR "/test.css\");",
+    "@import url('" SRCDIR "/test.css');",
+    "@import\nurl (\t\"" SRCDIR "/test.css\" ) ;",
     "@define-color bg_color #f9a039;",
     "@define-color color @bg_color;",
     "@define-color color rgb(100, 99, 88);",
@@ -48,8 +48,8 @@ test_parse_at (void)
   };
 
   const gchar *invalid[] = {
-    "@import test.css ;",
-    "@import url ( \"test.css\" xyz );",
+    "@import " SRCDIR "/test.css ;",
+    "@import url ( \"" SRCDIR "/test.css\" xyz );",
     "@import url(\");",
     "@import url(');",
     "@import url(\"abc');",
@@ -77,6 +77,8 @@ test_parse_at (void)
     {
       provider = gtk_css_provider_new ();
       res = gtk_css_provider_load_from_data (provider, valid[i], -1, &error);
+      if (error)
+        g_print ("parsing '%s': got unexpected error: %s\n", valid[i], error->message);
       g_assert_no_error (error);
       g_assert (res);