From b22ac84b4d31f0c644ca4b52586345f5c87a3135 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 03 Mar 2009 19:55:39 +0000 Subject: Remove hand-written .gir files, move PEP-8 inquisition into top Makefile.am We have more comprehensive testing in tests/scanner and tests/everything, and these tests were designed from a time when we were trying to make the g-ir-generate output exactly match the .gir, which has not been true for some time and will not be in the future. --- diff --git a/Makefile.am b/Makefile.am index 1a9b67c..2a4de03 100644 --- a/Makefile.am +++ b/Makefile.am @@ -50,3 +50,9 @@ release-tag: upload-release: $(distdir).tar.gz scp $(distdir).tar.gz gnome.org: ssh gnome.org install-module $(distdir).tar.gz + +check-local: + @echo " PEP-8 INQUISITION" + @find $(top_srcdir)/giscanner -name \*.py | sort | uniq | xargs $(PYTHON) $(top_srcdir)/misc/pep8.py --repeat + @echo " CHECK Pyflakes" + @find $(top_srcdir)/giscanner -name \*.py | sort | uniq | xargs $(PYTHON) $(top_srcdir)/misc/pyflakes.py diff --git a/tests/Makefile.am b/tests/Makefile.am index 3fe2813..bdaaa33 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,42 +1 @@ SUBDIRS = . scanner everything repository invoke offsets - -EXTRA_DIST = \ - array.gir \ - boxed.gir \ - constant.gir \ - enum.gir \ - errors.gir \ - extended.gir \ - function.gir \ - interface.gir \ - object.gir \ - struct.gir \ - types.gir \ - union.gir \ - xref1.gir \ - xref2.gir - -GIRTESTS = \ - boxed.gir.test \ - constant.gir.test \ - enum.gir.test \ - object.gir.test \ - struct.gir.test - -CLEANFILES = $(GIRTESTS:%.gir.test=%.1) $(GIRTESTS:%.gir.test=%.2) extended.gir.test - -extended.gir.test: $(srcdir)/extended.gir Makefile - $(DEBUG) $(top_builddir)/tools/g-ir-compiler --includedir=$(top_builddir)/gir $(srcdir)/extended.gir -o extended.gir.test - -%.gir.test: %.gir Makefile - @echo " TEST " $< - $(DEBUG) $(top_builddir)/tools/g-ir-compiler --includedir=$(top_builddir)/gir $< > $*.1 - $(DEBUG) $(top_builddir)/tools/g-ir-generate --includedir=$(top_builddir)/gir $*.1 > $*.2 - diff -u $(srcdir)/$*.gir $*.2 && rm $*.1 $*.2 - - -check-local: $(GIRTESTS) extended.gir.test - @echo " CHECK PEP-8" - @find $(top_srcdir)/giscanner -name \*.py | sort | uniq | xargs $(PYTHON) $(top_srcdir)/misc/pep8.py --repeat - @echo " CHECK Pyflakes" - @find $(top_srcdir)/giscanner -name \*.py | sort | uniq | xargs $(PYTHON) $(top_srcdir)/misc/pyflakes.py diff --git a/tests/array.gir b/tests/array.gir deleted file mode 100644 index 718dfd8..0000000 --- a/tests/array.gir +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/boxed.gir b/tests/boxed.gir deleted file mode 100644 index ef0e9a9..0000000 --- a/tests/boxed.gir +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/constant.gir b/tests/constant.gir deleted file mode 100644 index 6cb1a52..0000000 --- a/tests/constant.gir +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/tests/enum.gir b/tests/enum.gir deleted file mode 100644 index ed204be..0000000 --- a/tests/enum.gir +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/tests/errors.gir b/tests/errors.gir deleted file mode 100644 index 6353498..0000000 --- a/tests/errors.gir +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/extended.gir b/tests/extended.gir deleted file mode 100644 index fadb486..0000000 --- a/tests/extended.gir +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - diff --git a/tests/function.gir b/tests/function.gir deleted file mode 100644 index a32ccb1..0000000 --- a/tests/function.gir +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/interface.gir b/tests/interface.gir deleted file mode 100644 index 4182a61..0000000 --- a/tests/interface.gir +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/object.gir b/tests/object.gir deleted file mode 100644 index e0abed3..0000000 --- a/tests/object.gir +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/struct.gir b/tests/struct.gir deleted file mode 100644 index 9ef963b..0000000 --- a/tests/struct.gir +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/types.gir b/tests/types.gir deleted file mode 100644 index 36220ad..0000000 --- a/tests/types.gir +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - diff --git a/tests/union.gir b/tests/union.gir deleted file mode 100644 index 6e123de..0000000 --- a/tests/union.gir +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - diff --git a/tests/xref1.gir b/tests/xref1.gir deleted file mode 100644 index 17b9239..0000000 --- a/tests/xref1.gir +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/tests/xref2.gir b/tests/xref2.gir deleted file mode 100644 index 0ee4836..0000000 --- a/tests/xref2.gir +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - -- cgit v0.9.1