Add LIMIT= to make check

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 55060f8067d2c3cfe038b0c3fc1361344eb6ea2d..32e1b4c179b8b249299a38b3f6bd023b1fc2e1c2 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -21,6 +21,7 @@ info_TEXINFOS = recode.texi
 MAKEINFO = LANG= LANGUAGE= @MAKEINFO@
 
 EXTRA_DIST = rfc1345.texi File-Latin1 help2man
+MOSTLYCLEANFILES = recode.ops
 
 # Relative to $(srcdir).
 KELD = ../keld
@@ -30,8 +31,6 @@ MNEMONICS_DS = $(KELD)/iso10646.def $(KELD)/other.def $(KELD)/control.def
 PYTHON = python
 TABLES_PY = $(PYTHON) $(top_srcdir)/tables.py
 
-MOSTLYCLEANFILES = recode.ops
-
 $(srcdir)/recode.info: rfc1345.texi
 recode.dvi: rfc1345.texi
 

diff --git a/doc/Makefile.in b/doc/Makefile.in
index bd9affe7e3052ba6720314cdc2e7d2d344ff014b..9244a033ebc6098af821b08c82097d37a97ba927 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -219,6 +219,7 @@ top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = gnits
 info_TEXINFOS = recode.texi
 EXTRA_DIST = rfc1345.texi File-Latin1 help2man
+MOSTLYCLEANFILES = recode.ops
 
 # Relative to $(srcdir).
 KELD = ../keld
@@ -226,7 +227,6 @@ CHARSETS_DEF = $(KELD)/charsets.def
 MNEMONICS_DS = $(KELD)/iso10646.def $(KELD)/other.def $(KELD)/control.def
 PYTHON = python
 TABLES_PY = $(PYTHON) $(top_srcdir)/tables.py
-MOSTLYCLEANFILES = recode.ops
 all: all-am
 
 .SUFFIXES:

diff --git a/src/Makefile.am b/src/Makefile.am
index a61779077c566b67817879572280f9c47a3f5dea..a9e058a566d747f80b8f8920d3e7c05ec16e8d7e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,7 +26,9 @@ include_HEADERS = recode.h recodext.h
 noinst_HEADERS = argmatch.h charname.h common.h decsteps.h exit.h exitfail.h \
 fr-charname.h hash.h inisteps.h iconvdecl.h quotearg.h rfc1345.h tersteps.h \
 xalloc.h $(H_FALLBACKS) $(H_SURFACES)
+
 EXTRA_DIST = stamp-steps $(L_STEPS) mergelex.py $(MANS)
+CLEANFILES = iconvdecl.h
 
 C_STEPS = african.c afrtran.c applemac.c atarist.c bangbang.c cdcnos.c \
 ebcdic.c ibmpc.c iconqnx.c lat1asci.c mule.c strip-data.c testdump.c \
@@ -74,8 +76,6 @@ PERL = perl
 PYTHON = python
 TABLES_PY = $(PYTHON) $(top_srcdir)/tables.py
 
-CLEANFILES = iconvdecl.h
-
 $(srcdir)/merged.c: mergelex.py $(L_STEPS)
        (cd $(srcdir) && cat $(L_STEPS)) \
        | $(PYTHON) $(srcdir)/mergelex.py > merged.tm1

diff --git a/src/Makefile.in b/src/Makefile.in
index e37bf4b78e84a3e1958f187bc78f2a487ceb0a1c..fe3008e984c0a8cb8cb1c9d5cf5a54233050f766 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -270,6 +270,7 @@ fr-charname.h hash.h inisteps.h iconvdecl.h quotearg.h rfc1345.h tersteps.h \
 xalloc.h $(H_FALLBACKS) $(H_SURFACES)
 
 EXTRA_DIST = stamp-steps $(L_STEPS) mergelex.py $(MANS)
+CLEANFILES = iconvdecl.h
 C_STEPS = african.c afrtran.c applemac.c atarist.c bangbang.c cdcnos.c \
 ebcdic.c ibmpc.c iconqnx.c lat1asci.c mule.c strip-data.c testdump.c \
 ucs.c utf16.c utf7.c utf8.c varia.c vn.c $(C_FALLBACKS) $(C_SURFACES) \
@@ -304,7 +305,6 @@ TAGS_DEPENDENCIES = $(L_STEPS)
 PERL = perl
 PYTHON = python
 TABLES_PY = $(PYTHON) $(top_srcdir)/tables.py
-CLEANFILES = iconvdecl.h
 all: all-am
 
 .SUFFIXES:

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2e5cd9c85cef11feb055fc42a962c297165f5e1a..d1f7022116c2e72d4e1df300f408ffe78e85a32e 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -19,19 +19,22 @@
 
 AUTOMAKE_OPTIONS = gnits
 
+# LIMIT= may limit testing.  For example, "make check LIMIT='-l 1'" stops
+# testing after the first error, "make check LIMIT='-k utf7' runs files
+# matched by the "utf7" regexp.  Try "./pytest -h" for a list of options.
+
 SUITE = t21_names.py t22_lists.py t25_subsets.py t30_base64.py \
 t30_dumps.py t30_quoted.py t40_african.py t40_combine.py t40_testdump.py \
 t40_utf7.py t40_utf8.py t50_methods.py t90_bigauto.py
 
 EXTRA_DIST = NOTES Recode.c Recode.pyx pytest common.py $(SUITE)
+CLEANFILES = Recode.so
 
 PYTHON = python
 
-CLEANFILES = Recode.so
-
 check-local: Recode.so
        RECODE=../src/recode PYTHONPATH=.:$(srcdir) \
-         $(PYTHON) $(srcdir)/pytest $(srcdir)/t*.py
+         $(PYTHON) $(srcdir)/pytest $(LIMIT) $(srcdir)/t*.py
 
 Recode.so: Recode.c setup.py
        $(PYTHON) setup.py build

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 4e96c02ad90439814554f8f28e2b7a4e58640a3d..4de41bbedad90dacddc924270e8ccd442371119f 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -198,13 +198,17 @@ target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = gnits
+
+# LIMIT= may limit testing.  For example, "make check LIMIT='-l 1'" stops
+# testing after the first error, "make check LIMIT='-k utf7' runs files
+# matched by the "utf7" regexp.  Try "./pytest -h" for a list of options.
 SUITE = t21_names.py t22_lists.py t25_subsets.py t30_base64.py \
 t30_dumps.py t30_quoted.py t40_african.py t40_combine.py t40_testdump.py \
 t40_utf7.py t40_utf8.py t50_methods.py t90_bigauto.py
 
 EXTRA_DIST = NOTES Recode.c Recode.pyx pytest common.py $(SUITE)
-PYTHON = python
 CLEANFILES = Recode.so
+PYTHON = python
 all: all-am
 
 .SUFFIXES:
@@ -379,7 +383,7 @@ uninstall-am:
 
 check-local: Recode.so
        RECODE=../src/recode PYTHONPATH=.:$(srcdir) \
-         $(PYTHON) $(srcdir)/pytest $(srcdir)/t*.py
+         $(PYTHON) $(srcdir)/pytest $(LIMIT) $(srcdir)/t*.py
 
 Recode.so: Recode.c setup.py
        $(PYTHON) setup.py build