r23323 - gnucash/trunk/src/backend/xml/test - Copy the test-files to the builddir, and use that in GNC_TEST_FILES

[Geert Janssens]

Author: gjanssens
Date: 2013-10-24 08:28:01 -0400 (Thu, 24 Oct 2013)
New Revision: 23323
Trac: http://svn.gnucash.org/trac/changeset/23323

Modified:
   gnucash/trunk/src/backend/xml/test/Makefile.am
   gnucash/trunk/src/backend/xml/test/test-files/xml2/Makefile.am
   gnucash/trunk/src/backend/xml/test/test-load-xml2.c
   gnucash/trunk/src/backend/xml/test/test-xml2-is-file.c
Log:
Copy the test-files to the builddir, and use that in GNC_TEST_FILES

Author:    Frédéric Perrin <frederic.perrin at resel.fr>

Modified: gnucash/trunk/src/backend/xml/test/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/xml/test/Makefile.am	2013-10-24 12:27:49 UTC (rev 23322)
+++ gnucash/trunk/src/backend/xml/test/Makefile.am	2013-10-24 12:28:01 UTC (rev 23323)
@@ -195,7 +195,7 @@
 TESTS_ENVIRONMENT = \
   GUILE_WARN_DEPRECATED=no \
   GNC_ACCOUNT_PATH=${top_srcdir}/accounts/C \
-  GNC_TEST_FILES=${srcdir}/test-files/xml2 \
+  GNC_TEST_FILES=test-files/xml2 \
   SRCDIR=${srcdir} \
   GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \
   $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})

Modified: gnucash/trunk/src/backend/xml/test/test-files/xml2/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/xml/test/test-files/xml2/Makefile.am	2013-10-24 12:27:49 UTC (rev 23322)
+++ gnucash/trunk/src/backend/xml/test/test-files/xml2/Makefile.am	2013-10-24 12:28:01 UTC (rev 23323)
@@ -1,4 +1,4 @@
-EXTRA_DIST = \
+ACCT_TST_FILES = \
 	Money95bank_fr.gml2 \
 	Money95invst.gml2 \
 	Money95mutual.gml2 \
@@ -13,3 +13,11 @@
 	hierachical-data-file.gml2 \
 	ms-money.gml2 \
 	pricedb1.gml2 
+
+EXTRA_DIST = $(ACCT_TST_FILES)
+
+check:
+	for file in $(ACCT_TST_FILES); do			\
+		test $(srcdir)/$$file -ef $(builddir)/$$file ||	\
+		cp $(srcdir)/$$file $(builddir)/$$file;		\
+	done;

Modified: gnucash/trunk/src/backend/xml/test/test-load-xml2.c
===================================================================
--- gnucash/trunk/src/backend/xml/test/test-load-xml2.c	2013-10-24 12:27:49 UTC (rev 23322)
+++ gnucash/trunk/src/backend/xml/test/test-load-xml2.c	2013-10-24 12:28:01 UTC (rev 23323)
@@ -113,6 +113,7 @@
 main (int argc, char ** argv)
 {
     const char *location = g_getenv("GNC_TEST_FILES");
+    int files_tested = 0;
     GDir *xml2_dir;
 
     qof_init();
@@ -143,6 +144,7 @@
                 if (!g_file_test(to_open, G_FILE_TEST_IS_DIR))
                 {
                     test_load_file(to_open);
+                    files_tested++;
                 }
                 g_free(to_open);
             }
@@ -151,6 +153,11 @@
 
     g_dir_close(xml2_dir);
 
+    if (files_tested == 0)
+    {
+        failure("handled 0 files in test-load-xml2");
+    }
+
     print_test_results();
     qof_close();
     exit(get_rv());

Modified: gnucash/trunk/src/backend/xml/test/test-xml2-is-file.c
===================================================================
--- gnucash/trunk/src/backend/xml/test/test-xml2-is-file.c	2013-10-24 12:27:49 UTC (rev 23322)
+++ gnucash/trunk/src/backend/xml/test/test-xml2-is-file.c	2013-10-24 12:28:01 UTC (rev 23323)
@@ -18,7 +18,7 @@
 
     if (!directory)
     {
-        directory = "../../../../accounts/C";
+        directory = "test-files/xml2";
     }
 
     filename = malloc(strlen(directory) + 1 + strlen(FILENAME) + 1);