Makefile.decl Bypass gtester related stuff on Windows.

2008-09-30  Tor Lillqvist  <tml@novell.com>

	* Makefile.decl
	* glib/tests/Makefile.am: Bypass gtester related stuff on Windows.


svn path=/trunk/; revision=7564
This commit is contained in:
Tor Lillqvist 2008-09-30 14:46:45 +00:00 committed by Tor Lillqvist
parent b1557680dd
commit 23a4ae82e5
3 changed files with 12 additions and 0 deletions

View File

@ -1,3 +1,8 @@
2008-09-30 Tor Lillqvist <tml@novell.com>
* Makefile.decl
* glib/tests/Makefile.am: Bypass gtester related stuff on Windows.
2008-09-30 Tor Lillqvist <tml@novell.com>
* glib/gprintf.c

View File

@ -12,11 +12,14 @@ TEST_PROGS =
# test: run all tests in cwd and subdirs
test: ${TEST_PROGS}
if OS_UNIX
@test -z "${TEST_PROGS}" || ${GTESTER} --verbose ${TEST_PROGS}
@ for subdir in $(SUBDIRS) . ; do \
test "$$subdir" = "." -o "$$subdir" = "po" || \
( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
done
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

View File

@ -44,6 +44,8 @@ markup_subparser_LDADD = $(progs_ldadd)
TEST_PROGS += array-test
array_test_LDADD = $(progs_ldadd)
if OS_UNIX
# some testing of gtester funcitonality
XMLLINT=xmllint
gtester-xmllint-check: # check testreport xml with xmllint if present
@ -51,6 +53,8 @@ gtester-xmllint-check: # check testreport xml with xmllint if present
${XMLLINT} --version 2>/dev/null; test "$$?" != 0 || ${XMLLINT} --noout tmpsample.xml
check-am: gtester-xmllint-check
endif
CLEANFILES = \
tmpsample.xml