[glib] More test fixes for builddir != srcdir
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] More test fixes for builddir != srcdir
- Date: Tue, 28 May 2013 02:05:55 +0000 (UTC)
commit 4c9a7b65eb028f78ad4e68c177e4ee634124b694
Author: Matthias Clasen <mclasen redhat com>
Date: Mon May 27 22:05:19 2013 -0400
More test fixes for builddir != srcdir
tests/Makefile.am | 1 +
tests/iochannel-test.c | 2 +-
tests/unicode-caseconv.c | 2 +-
tests/unicode-encoding.c | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a5493b9..6f4b82e 100644
--- 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
--- 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
--- 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
--- 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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]