On Thursday 06 November 2014 08:48:08 Giuseppe Scrivano wrote: > Tim Rühsen <[email protected]> writes: > > Am Dienstag, 4. November 2014, 17:19:42 schrieb Giuseppe Scrivano: > >> Tim Ruehsen <[email protected]> writes: > >> > * configure.ac: check for python3 > >> > * Makefile.am: only use python test suite if python3 found > >> > > >> > On system without python3 the test suite will fail since > >> > the tests are designed for python3 only. > >> > > >> > Please review. > >> > > >> > Tim > >> > > >> > * configure.ac: Fix check for libpsl > >> > > >> > diff --git a/Makefile.am b/Makefile.am > >> > index a059794..8bf7def 100644 > >> > --- a/Makefile.am > >> > +++ b/Makefile.am > >> > @@ -41,7 +41,10 @@ distuninstallcheck_listfiles = find . -type f | \ > >> > > >> > ACLOCAL_AMFLAGS = -I m4 > >> > > >> > # subdirectories in the distribution > >> > > >> > -SUBDIRS = lib src doc po tests util testenv > >> > +SUBDIRS = lib src doc po tests util > >> > +if HAVE_PYTHON > >> > + SUBDIRS += testenv > >> > +endif > >> > >> I-ve not tried it, but I am afraid this will break make dist on systems > >> without python3 as testenv is not even included in Makefile.in. We > >> should check for HAVE_PYTHON (that ideally is HAVE_PYTHON3) inside the > >> testenv/Makefile.am itself and skip tests if not present. > > > > You are right. > > > > I amended the patch to reflect your idea. > > > > I tested make distcheck with and without python3 available. > > > > Please have a look. > > yes, now the patch looks correct since we list all tests in EXTRA_DIST > and there is no risk to miss them in a "make dist".
I pushed it. Tim
signature.asc
Description: This is a digitally signed message part.
