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

diff --git a/ChangeLog b/ChangeLog
index 22698262c6bea8e20d9adbc30358641f60ef8508..5496d819957f3d993eaeac7d50653f83372d7ca5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/Makefile.decl b/Makefile.decl
index e7ca0d0567e257bdbeb1b7956b87b0e0d55ff513..cbc0da121adc10d3bfc750e341594993868855df 100644 (file)
--- 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 1e63a73410e0b82be2586e4582a98e7fee89d6ce..3d497ac233c8bb89f5d4730d4b7d755d9aa216fd 100644 (file)
--- 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