summaryrefslogtreecommitdiff
path: root/Makefile.decl
diff options
context:
space:
mode:
author18:59:59 Tim Janik <timj@imendio.com>2007-12-05 16:58:44 +0000
committerTim Janik <timj@src.gnome.org>2007-12-05 16:58:44 +0000
commit9ba5da2f3644bdf5494a6b06dce7b6914e44b5af (patch)
tree3137551b1d0f3b9111b76d6c07c6381f2e24942c /Makefile.decl
parent4a82f84a28750dd37e03ffc9bbf4cf7fefc3a85a (diff)
downloadgtk+-9ba5da2f3644bdf5494a6b06dce7b6914e44b5af.tar.gz
run tests in current dir after setting up the logging directory, so their
2007-12-05 18:59:59 Tim Janik <timj@imendio.com> * gtk+/Makefile.decl: run tests in current dir after setting up the logging directory, so their results get properly merged into the resulting test log. * gtk+/gtk/gtktestutils.[hc]: added gtk_test_list_all_types() for tests to loop over registered Gdk/Gtk+ types. * gtk+/tests/objecttests.c: new test program, implements automated property tests. several properties are blacklisted because they seem to trigger Gdk/Gtk+ bugs. ./objecttests -m thorough --verbose can be used to test blacklisted properties and see which proprty failed. svn path=/trunk/; revision=19115
Diffstat (limited to 'Makefile.decl')
-rw-r--r--Makefile.decl28
1 files changed, 14 insertions, 14 deletions
diff --git a/Makefile.decl b/Makefile.decl
index 2963f2bd4f..4caa19b772 100644
--- a/Makefile.decl
+++ b/Makefile.decl
@@ -32,20 +32,6 @@ test: ${TEST_PROGS}
# 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 ; \
- $(XVFB_START) && { \
- 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 ; \
@@ -55,6 +41,20 @@ test-report perf-report full-report: ${TEST_PROGS}
test "$$subdir" = "." -o "$$subdir" = "po" -o "$$subdir" = "po-properties" || \
( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
done ; \
+ 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 ; \
+ $(XVFB_START) && { \
+ 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 || { \
echo '<?xml version="1.0"?>' > $@.xml ; \
echo '<report-collection>' >> $@.xml ; \