[gxml/wip/fixes: 2/3] test: Clean up setting of TEST_DIR/TEST_SAVE_DIR

[Rico Tzschichholz <ricotz src gnome org>]

commit 73dd24e08728a9e6a635b50946496ab934cb8dc1
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Thu Mar 2 08:25:03 2017 +0100

    test: Clean up setting of TEST_DIR/TEST_SAVE_DIR

 configure.ac              |    1 -
 test/Makefile.am          |    5 ++---
 test/tests-config.vala.in |    4 ----
 vapi/gxml-test.vapi       |    6 ++++--
 4 files changed, 6 insertions(+), 10 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3f393b8..e638b52 100644
--- a/configure.ac
+++ b/configure.ac
@@ -252,7 +252,6 @@ test/test_invalid.xml
 test/test_out_path_expected.xml
 test/test_out_stream_expected.xml
 test/test_with_ns.xml
-test/tests-config.vala
 docs/Makefile
 docs/valadoc/Makefile
 docs/valadoc/devhelp/Makefile
diff --git a/test/Makefile.am b/test/Makefile.am
index 9fcdd85..054d3c8 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -16,7 +16,8 @@ AM_CFLAGS = \
        $(LIBXML_CFLAGS) \
        $(GIO_CFLAGS) \
        -I$(top_builddir) \
-       -DTEST_DIR=\"$(builddir)\" \
+       -DTEST_DIR=\"$(abs_builddir)\" \
+       -DTEST_SAVE_DIR=\"$(abs_builddir)\" \
        $(NULL)
 
 
@@ -25,7 +26,6 @@ noinst_PROGRAMS = $(TEST_PROGS)
 TEST_PROGS += gxml_test
 
 sources = \
-       tests-config.vala \
        GXmlTest.vala \
        NodeListTest.vala \
        ValaLibxml2Test.vala \
@@ -103,7 +103,6 @@ AM_VALAFLAGS = \
        --pkg libxml-2.0 \
        -C \
        -g \
-       -X -DTEST_DIR=$(top_srcdir)/test \
        $(NULL)
 
 if DEBUG
diff --git a/vapi/gxml-test.vapi b/vapi/gxml-test.vapi
index f9f1d0f..7d408bd 100644
--- a/vapi/gxml-test.vapi
+++ b/vapi/gxml-test.vapi
@@ -7,7 +7,9 @@
  * This defines a string for Vala that we can then at compile time use
  * "-X -DTEST_DIR=$(top_srcdir)/test so gxml_test can find its
  * tests, similar to how libgdata does it in C. */
-namespace GXml {
+namespace GXmlTestConfig {
        [CCode (cname = "TEST_DIR")]
        public const string TEST_DIR;
-}
\ No newline at end of file
+       [CCode (cname = "TEST_SAVE_DIR")]
+       public const string TEST_SAVE_DIR;
+}