From 23a4ae82e5088fd12e951d0c41efa5ab2d206624 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 30 Sep 2008 14:46:45 +0000 Subject: [PATCH] Makefile.decl Bypass gtester related stuff on Windows. 2008-09-30 Tor Lillqvist * Makefile.decl * glib/tests/Makefile.am: Bypass gtester related stuff on Windows. svn path=/trunk/; revision=7564 --- ChangeLog | 5 +++++ Makefile.decl | 3 +++ glib/tests/Makefile.am | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/ChangeLog b/ChangeLog index 22698262c..5496d8199 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-09-30 Tor Lillqvist + + * Makefile.decl + * glib/tests/Makefile.am: Bypass gtester related stuff on Windows. + 2008-09-30 Tor Lillqvist * glib/gprintf.c diff --git a/Makefile.decl b/Makefile.decl index e7ca0d056..cbc0da121 100644 --- a/Makefile.decl +++ b/Makefile.decl @@ -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 diff --git a/glib/tests/Makefile.am b/glib/tests/Makefile.am index 1e63a7341..3d497ac23 100644 --- a/glib/tests/Makefile.am +++ b/glib/tests/Makefile.am @@ -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