glib r7564 - in trunk: . glib/tests

[tml svn gnome org]

Author: tml
Date: Tue Sep 30 14:46:45 2008
New Revision: 7564
URL: http://svn.gnome.org/viewvc/glib?rev=7564&view=rev

Log:
2008-09-30  Tor Lillqvist  <tml novell com>

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



Modified:
   trunk/ChangeLog
   trunk/Makefile.decl
   trunk/glib/tests/Makefile.am

Modified: trunk/Makefile.decl
==============================================================================
--- trunk/Makefile.decl	(original)
+++ trunk/Makefile.decl	Tue Sep 30 14:46:45 2008
@@ -12,11 +12,14 @@
 
 # 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

Modified: trunk/glib/tests/Makefile.am
==============================================================================
--- trunk/glib/tests/Makefile.am	(original)
+++ trunk/glib/tests/Makefile.am	Tue Sep 30 14:46:45 2008
@@ -44,6 +44,8 @@
 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 @@
 	${XMLLINT} --version 2>/dev/null; test "$$?" != 0 || ${XMLLINT} --noout tmpsample.xml
 check-am: gtester-xmllint-check
 
+endif
+
 CLEANFILES = \
 	tmpsample.xml