diff options
| author | Tor Lillqvist <tml@novell.com> | 2008-09-30 14:46:45 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2008-09-30 14:46:45 +0000 |
| commit | 23a4ae82e5088fd12e951d0c41efa5ab2d206624 (patch) | |
| tree | 12bc35c080a6c82432d67c931a5f927ad8ff6b92 | |
| parent | b1557680dd3f8531883bb768cd7438632c67bffe (diff) | |
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
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.decl | 3 | ||||
| -rw-r--r-- | glib/tests/Makefile.am | 4 |
3 files changed, 12 insertions, 0 deletions
@@ -1,5 +1,10 @@ 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 * glib/gnulib/vasnprintf.c: Don't define _GNU_SOURCE on Windows, as _GNU_SOURCE has unintended side effects when compiling against 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 |