IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2024-11-23 09:26:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix new cdv-import tests for running in a separate build directory.

Browse Source
This commit is contained in:
John Ralls 2016-01-21 12:07:29 -08:00
parent 10fbd1fdd2
commit 60ae4ac8ec
3 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -1613,6 +1613,8 @@ AC_CONFIG_FILES([src/tax/us/test/test-load-module],
# A few files need extra actions at creation time # A few files need extra actions at creation time
AC_CONFIG_FILES([src/bin/overrides/gnucash-make-guids], [chmod u+x src/bin/overrides/gnucash-make-guids]) AC_CONFIG_FILES([src/bin/overrides/gnucash-make-guids], [chmod u+x src/bin/overrides/gnucash-make-guids])
#Link (copy on Windows) test data files:
AC_CONFIG_LINKS([src/import-export/csv-imp/test/sample1.csv:src/import-export/csv-imp/test/sample1.csv])
LDFLAGS="${LDFLAGS} ${NOUNDEF}" LDFLAGS="${LDFLAGS} ${NOUNDEF}"
AC_OUTPUT AC_OUTPUT

31
src/import-export/csv-imp/test/Makefile.am
View File

@ -24,12 +24,12 @@ test_csv_imp_SOURCES = \
test-csv-imp.c \ test-csv-imp.c \
utest-gnc-csv-model.c utest-gnc-csv-model.c
test_csv_imp_HEADERSS = test_csv_imp_HEADERS =
#The tests might require more libraries, but try to keep them #The tests might require more libraries, but try to keep them
#as independent as possible. #as independent as possible.
test_csv_imp_LDADD = \ test_csv_imp_LDADD = \
${top_builddir}/${MODULEPATH}/libgncmod-csv-import.la \ ${top_builddir}/${MODULEPATH}/Libgncmod-csv-import.la \
${top_builddir}/src/import-export/libgncmod-generic-import.la \ ${top_builddir}/src/import-export/libgncmod-generic-import.la \
${top_builddir}/src/gnome/libgnc-gnome.la \ ${top_builddir}/src/gnome/libgnc-gnome.la \
${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \ ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
@ -66,8 +66,33 @@ test_csv_imp_CFLAGS = \
${GTK_CFLAGS} \ ${GTK_CFLAGS} \
${GLIB_CFLAGS} ${GLIB_CFLAGS}
GNC_TEST_DEPS = \
--library-dir ${top_builddir}/${MODULEPATH} \
--library-dir ${top_builddir}/src/import-export \
--library-dir ${top_builddir}/src/gnome \
--library-dir ${top_builddir}/src/gnome-utils \
--library-dir ${top_builddir}/src/gnome-search \
--library-dir ${top_builddir}/src/register/ledger-core \
--library-dir ${top_builddir}/src/register/register-core \
--library-dir ${top_builddir}/src/register/register-gnome \
--library-dir ${top_builddir}/src/report/report-system \
--library-dir ${top_builddir}/src/report/report-gnome \
--library-dir ${top_builddir}/src/html \
--library-dir ${top_builddir}/src/app-utils \
--library-dir ${top_builddir}/src/backend/xml \
--library-dir ${top_builddir}/src/engine \
--library-dir ${top_builddir}/src/core-utils \
--library-dir ${top_builddir}/src/gnc-module \
--library-dir ${top_builddir}/src/libqof/qof \
--library-dir ${top_builddir}/lib/stf
TESTS_ENVIRONMENT = \ TESTS_ENVIRONMENT = \
SRCDIR=${srcdir} \ SRCDIR=${srcdir} \
G_DEBUG= G_DEBUG= \
$(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GNC_TEST_DEPS})
EXTRA_DIST= \
sample1.csv
AM_CPPFLAGS = -DG_LOG_DOMAIN=\"gnc.import.csv\" AM_CPPFLAGS = -DG_LOG_DOMAIN=\"gnc.import.csv\"

4
src/import-export/csv-imp/test/test-csv-imp.c
View File

@ -40,7 +40,7 @@ main (int argc,
qof_init(); /* Initialize the GObject system */ qof_init(); /* Initialize the GObject system */
qof_log_init_filename_special("stderr"); /* Init the log system */ qof_log_init_filename_special("stderr"); /* Init the log system */
g_test_init ( &argc, &argv, NULL ); /* initialize test program */ g_test_init ( &argc, &argv, NULL ); /* initialize test program */
qof_log_set_level("gnc", G_LOG_LEVEL_DEBUG); qof_log_set_level("gnc", (QofLogLevel)G_LOG_LEVEL_DEBUG);
g_test_bug_base("https://bugzilla.gnome.org/show_bug.cgi?id="); /* init the bugzilla URL */ g_test_bug_base("https://bugzilla.gnome.org/show_bug.cgi?id="); /* init the bugzilla URL */
/* Disable the transaction log */ /* Disable the transaction log */
xaccLogDisable(); xaccLogDisable();
@ -58,5 +58,3 @@ main (int argc,
return g_test_run(); return g_test_run();
} }