mirror of
https://github.com/Gnucash/gnucash.git
synced 2024-11-22 08:57:17 -06:00
45cb5504f3
This was done by branching right before the original merge and redoing a clean merge of the private-kvp branch again. This result was then cherry-picked onto master with git cherry-pick <merge-commit> -m 1 It was done like this because git merge would consider the private-kvp branch already merged even after a revert (see git-revert man page) and won't allow to merge a second time on the same branch. Resolved conflicts: README.dependencies src/app-utils/gnc-sx-instance-model.c src/engine/cap-gains.c src/engine/test/Makefile.am src/gnome/assistant-hierarchy.c src/import-export/import-match-map.c src/import-export/import-utilities.c src/import-export/ofx/gnc-ofx-kvp.c src/libqof/qof/qofbook.cpp src/libqof/qof/qofinstance-p.h src/libqof/qof/qofinstance.cpp src/libqof/qof/test/test-kvp_frame.c src/report/report-gnome/gnc-plugin-page-report.c
98 lines
3.8 KiB
Makefile
98 lines
3.8 KiB
Makefile
# GLIB - Library of useful C routines
|
|
|
|
GTESTER = gtester # for non-GLIB packages
|
|
GTESTER_REPORT = gtester-report
|
|
#GTESTER = $(top_builddir)/glib/gtester # for the GLIB package
|
|
#GTESTER_REPORT = $(top_builddir)/glib/gtester-report # for the GLIB package
|
|
|
|
# initialize variables for unconditional += appending
|
|
EXTRA_DIST =
|
|
TEST_PROGS =
|
|
|
|
### testing rules
|
|
|
|
# test: run all tests in cwd and subdirs
|
|
test: test-nonrecursive
|
|
if !PLATFORM_WIN32
|
|
@ for subdir in $(SUBDIRS) . ; do \
|
|
test "$$subdir" = "." -o "$$subdir" = "po" || \
|
|
( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
|
|
done
|
|
endif
|
|
|
|
# test-nonrecursive: run tests only in cwd
|
|
test-nonrecursive: ${TEST_PROGS}
|
|
if !PLATFORM_WIN32
|
|
@test -z "${TEST_PROGS}" || MALLOC_CHECK_=2 MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256)) ${TESTS_ENVIRONMENT} ${GTESTER} --verbose ${TEST_PROGS}
|
|
endif
|
|
|
|
# test-report: run tests in subdirs and generate report
|
|
# perf-report: run tests in subdirs with -m perf and generate report
|
|
# full-report: like test-report: with -m perf and -m slow
|
|
test-report perf-report full-report: ${TEST_PROGS}
|
|
@test -z "${TEST_PROGS}" || { \
|
|
case $@ in \
|
|
test-report) test_options="-k";; \
|
|
perf-report) test_options="-k -m=perf";; \
|
|
full-report) test_options="-k -m=perf -m=slow";; \
|
|
esac ; \
|
|
if test -z "$$GTESTER_LOGDIR" ; then \
|
|
${GTESTER} --verbose $$test_options -o test-report.xml ${TEST_PROGS} ; \
|
|
elif test -n "${TEST_PROGS}" ; then \
|
|
${GTESTER} --verbose $$test_options -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ${TEST_PROGS} ; \
|
|
fi ; \
|
|
}
|
|
@ ignore_logdir=true ; \
|
|
if test -z "$$GTESTER_LOGDIR" ; then \
|
|
GTESTER_LOGDIR=`mktemp -d "\`pwd\`/.testlogs-XXXXXX"`; export GTESTER_LOGDIR ; \
|
|
ignore_logdir=false ; \
|
|
fi ; \
|
|
if test -d "$(top_srcdir)/.git" ; then \
|
|
REVISION=`git describe` ; \
|
|
else \
|
|
REVISION=$(VERSION) ; \
|
|
fi ; \
|
|
for subdir in $(SUBDIRS) . ; do \
|
|
test "$$subdir" = "." -o "$$subdir" = "po" || \
|
|
( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
|
|
done ; \
|
|
$$ignore_logdir || { \
|
|
echo '<?xml version="1.0"?>' > $@.xml ; \
|
|
echo '<report-collection>' >> $@.xml ; \
|
|
echo '<info>' >> $@.xml ; \
|
|
echo ' <package>$(PACKAGE)</package>' >> $@.xml ; \
|
|
echo ' <version>$(VERSION)</version>' >> $@.xml ; \
|
|
echo " <revision>$$REVISION</revision>" >> $@.xml ; \
|
|
echo '</info>' >> $@.xml ; \
|
|
for lf in `ls -L "$$GTESTER_LOGDIR"/.` ; do \
|
|
sed '1,1s/^<?xml\b[^>?]*?>//' <"$$GTESTER_LOGDIR"/"$$lf" >> $@.xml ; \
|
|
done ; \
|
|
echo >> $@.xml ; \
|
|
echo '</report-collection>' >> $@.xml ; \
|
|
rm -rf "$$GTESTER_LOGDIR"/ ; \
|
|
${GTESTER_REPORT} --version 2>/dev/null 1>&2 ; test "$$?" != 0 || ${GTESTER_REPORT} $@.xml >$@.html ; \
|
|
}
|
|
.PHONY: test test-report perf-report full-report test-nonrecursive
|
|
|
|
.PHONY: lcov genlcov lcov-clean
|
|
# use recursive makes in order to ignore errors during check
|
|
lcov:
|
|
-$(MAKE) $(AM_MAKEFLAGS) -k check
|
|
$(MAKE) $(AM_MAKEFLAGS) genlcov
|
|
|
|
# we have to massage the lcov.info file slightly to hide the effect of libtool
|
|
# placing the objects files in the .libs/ directory separate from the *.c
|
|
# we also have to delete tests/.libs/libmoduletestplugin_*.gcda
|
|
genlcov:
|
|
rm -f $(top_builddir)/tests/.libs/libmoduletestplugin_*.gcda
|
|
$(LTP) --directory $(top_builddir) --capture --output-file glib-lcov.info --test-name GLIB_PERF --no-checksum --compat-libtool
|
|
LANG=C $(LTP_GENHTML) --prefix $(top_builddir) --output-directory glib-lcov --title "GLib Code Coverage" --legend --show-details glib-lcov.info
|
|
|
|
lcov-clean:
|
|
-$(LTP) --directory $(top_builddir) -z
|
|
-rm -rf glib-lcov.info glib-lcov
|
|
-find -name '*.gcda' -print | xargs rm
|
|
|
|
# run tests in cwd as part of make check
|
|
check-local: test-nonrecursive
|