[gobject-introspection] fix "make distcheck"
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gobject-introspection] fix "make distcheck"
- Date: Sun, 21 Apr 2013 12:39:46 +0000 (UTC)
commit 274d4f28a00d1d2bbfc4a1fe4dbbd4ad545b1ec3
Author: Dieter Verfaillie <dieterv optionexplicit be>
Date: Wed Apr 10 00:00:37 2013 +0200
fix "make distcheck"
- Configure with --enable-doctool when running "make distcheck"
- Remove $(top_builddir)/.make-check-passed as the pre-commit hook
using this was removed in de84ea0cf212c251e099f456bb675492f664e93d
- Fix CLEANFILES + manual rm invocations
- Fix running warning tests uninstalled (VPATH build issue)
https://bugzilla.gnome.org/show_bug.cgi?id=697669
Makefile.am | 3 +--
tests/Makefile.am | 2 ++
tests/scanner/Makefile.am | 9 ++++++---
tests/warn/Makefile.am | 4 ++--
tests/warn/warntestrunner | 2 +-
5 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 736f3ad..202464f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,7 +29,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
SUBDIRS = . docs tests build
DIST_SUBDIRS = m4 $(SUBDIRS)
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-doctool
man_MANS += \
docs/g-ir-compiler.1 \
@@ -63,7 +63,6 @@ check-local:
PYTHONPATH="$(top_builddir):$(top_srcdir)" $(PYTHON)
$(top_srcdir)/tests/scanner/annotationparser/test_patterns.py
@echo "TEST: GTK-Doc Annotation Parser"
PYTHONPATH="$(top_builddir):$(top_srcdir)" $(PYTHON)
$(top_srcdir)/tests/scanner/annotationparser/test_parser.py
- @touch $(top_builddir)/.make-check-passed
check-pyflakes:
@echo " CHECK Pyflakes"
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b4985b9..56fc479 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -28,7 +28,9 @@ BUILT_SOURCES += everything.c everything.h
CLEANFILES += \
$(BUILT_SOURCES) \
everything-stamp.h \
+ Everything-1.0.gir \
Everything-1.0.typelib \
+ GIMarshallingTests-1.0.gir \
GIMarshallingTests-1.0.typelib
everything-stamp.h: Makefile
diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am
index 31487a6..faf2947 100644
--- a/tests/scanner/Makefile.am
+++ b/tests/scanner/Makefile.am
@@ -142,6 +142,7 @@ GIRS += Bar-1.0.gir
endif
EXTRA_DIST += headeronly.h
+CLEANFILES += Headeronly-1.0.gir
Headeronly-1.0.gir: headeronly.h
$(AM_V_GEN) $(INTROSPECTION_SCANNER) $(INTROSPECTION_SCANNER_ARGS) --warn-all --warn-error
--reparse-validate --namespace=Headeronly --nsversion=1.0 --header-only --output=$@ $<
@@ -153,21 +154,23 @@ if BUILD_DOCTOOL
DOCGIRS = Regress-1.0.gir
CHECKDOCS = $(DOCGIRS:.gir=-C.page.check) $(DOCGIRS:.gir=-Python.page.check) $(DOCGIRS:.gir=-Gjs.page.check)
MALLARD_DIRS = $(DOCGIRS:.gir=-C) $(DOCGIRS:.gir=-Python) $(DOCGIRS:.gir=-Gjs)
+MALLARD_CLEAN = $(DOCGIRS:.gir=-C)/* $(DOCGIRS:.gir=-Python)/* $(DOCGIRS:.gir=-Gjs)/*
EXPECTED_MALLARD_DIRS = $(MALLARD_DIRS:=-expected)
+CLEANFILES += $(MALLARD_CLEAN)
%-C: %.gir
$(AM_V_GEN)
- $(AM_V_at)rm -f $*-C/*.page
+ $(AM_V_at)rm -rf $*-C
$(AM_V_at)$(INTROSPECTION_DOCTOOL) $(INTROSPECTION_DOCTOOL_ARGS) --language C $*.gir -o $*-C/
%-Python: %.gir
$(AM_V_GEN)
- $(AM_V_at)rm -f $*-Python/*.page
+ $(AM_V_at)rm -rf $*-Python
$(AM_V_at)$(INTROSPECTION_DOCTOOL) $(INTROSPECTION_DOCTOOL_ARGS) --language Python $*.gir -o
$*-Python/
%-Gjs: %.gir
$(AM_V_GEN)
- $(AM_V_at)rm -f $*-Gjs/*.page
+ $(AM_V_at)rm -rf $*-Gjs
$(AM_V_at)$(INTROSPECTION_DOCTOOL) $(INTROSPECTION_DOCTOOL_ARGS) --language Gjs $*.gir -o $*-Gjs/
%-C.page.check: %-C
diff --git a/tests/warn/Makefile.am b/tests/warn/Makefile.am
index 875d8ef..bce4562 100644
--- a/tests/warn/Makefile.am
+++ b/tests/warn/Makefile.am
@@ -6,7 +6,6 @@ alltests = \
annotationparser.h \
callback-invalid-scope.h \
callback-missing-scope.h \
- return-gobject.h \
invalid-array.h \
invalid-closure.h \
invalid-constructor.h \
@@ -16,9 +15,10 @@ alltests = \
invalid-out.h \
invalid-transfer.h \
missing-element-type.h \
+ return-gobject.h \
unknown-parameter.h \
unresolved-type.h
-EXTRA_DIST = warningtester.py warntestrunner $(alltests) common.h $(TESTS)
+EXTRA_DIST = warningtester.py $(alltests) common.h $(TESTS)
TESTS_ENVIRONMENT = PYTHONPATH=$(top_builddir):$(top_srcdir) TOP_BUILDDIR=$(top_builddir)
UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) PYTHON=$(PYTHON) srcdir=$(srcdir) alltests="$(alltests)"
diff --git a/tests/warn/warntestrunner b/tests/warn/warntestrunner
index 3deb381..d3a4e87 100755
--- a/tests/warn/warntestrunner
+++ b/tests/warn/warntestrunner
@@ -4,5 +4,5 @@ set -e
for testname in ${alltests}; do
echo "Running warning test:" $testname
- $PYTHON $srcdir/warningtester.py "$testname"
+ $PYTHON $srcdir/warningtester.py "$srcdir/$testname"
done
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]