More test fixes for builddir != srcdir

diff --git a/tests/Makefile.am b/tests/Makefile.am
index a5493b9..6f4b82e 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -8,6 +8,7 @@ AM_CPPFLAGS = \
        $(gmodule_INCLUDES)                     \
        -DGLIB_DISABLE_DEPRECATION_WARNINGS     \
        -DG_LOG_DOMAIN=\"GLib\"                 \
+       -DSRCDIR=\"$(srcdir)\"                  \
        $(GLIB_DEBUG_FLAGS)
 
 AM_CFLAGS = -g

diff --git a/tests/iochannel-test.c b/tests/iochannel-test.c
index 81c04da..57d31c9 100644 (file)
--- a/tests/iochannel-test.c
+++ b/tests/iochannel-test.c
@@ -69,7 +69,7 @@ gint main (gint argc, gchar * argv[])
     if (g_getenv ("G_TEST_DATA"))
       datapath = g_getenv ("G_TEST_DATA");
     else
-      datapath = ".";
+      datapath = SRCDIR;
 
     filename = g_build_filename (datapath, "iochannel-test-infile", NULL);
   

diff --git a/tests/unicode-caseconv.c b/tests/unicode-caseconv.c
index 0147a3b..467a3a0 100644 (file)
--- a/tests/unicode-caseconv.c
+++ b/tests/unicode-caseconv.c
@@ -24,7 +24,7 @@ int main (int argc, char **argv)
   if (g_getenv ("G_TEST_DATA"))
     srcdir = g_getenv ("G_TEST_DATA");
   else
-    srcdir = ".";
+    srcdir = SRCDIR;
 
   filename = g_strconcat (srcdir, G_DIR_SEPARATOR_S, "casemap.txt", NULL);
 

diff --git a/tests/unicode-encoding.c b/tests/unicode-encoding.c
index 0d187a8..e120a72 100644 (file)
--- a/tests/unicode-encoding.c
+++ b/tests/unicode-encoding.c
@@ -324,7 +324,7 @@ main (int argc, char **argv)
   if (g_getenv ("G_TEST_DATA"))
     srcdir = g_getenv ("G_TEST_DATA");
   else
-    srcdir = ".";
+    srcdir = SRCDIR;
   
   testfile = g_strconcat (srcdir, G_DIR_SEPARATOR_S "utf8.txt", NULL);