Changeset: 28aba19be2a4 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=28aba19be2a4 Modified Files: configure.ag testing/Mfilter.py.in testing/Mtest.py.in Branch: Oct2012 Log Message:
Mtest: require Python 2 Mtest and Mfilter are too large to just fix for Python 3. For the time being just use Python 2 for them. This means, if we don't have Python 2 (technically possible now autogen runs fine with Python 3) we can't install testing. diffs (35 lines): diff --git a/configure.ag b/configure.ag --- a/configure.ag +++ b/configure.ag @@ -1258,6 +1258,13 @@ AC_SUBST(PYTHON3) AM_CONDITIONAL(HAVE_PYTHON3, test x"$have_python3" != xno) AC_SUBST(PYTHON3_LIBDIR) +# Mtest/Mfilter currently require Python 2 +if test "x$enable_testing" != xno ; then + if test "x$PYTHON2" = xfalse ; then + enable_testing = no + fi +fi + RUBY=ruby have_rubygem_dir=auto AC_ARG_WITH(rubygem-dir, diff --git a/testing/Mfilter.py.in b/testing/Mfilter.py.in --- a/testing/Mfilter.py.in +++ b/testing/Mfilter.py.in @@ -1,4 +1,4 @@ -#!@PYTHON@ +#!@PYTHON2@ # The contents of this file are subject to the MonetDB Public License # Version 1.1 (the "License"); you may not use this file except in diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in --- a/testing/Mtest.py.in +++ b/testing/Mtest.py.in @@ -1,4 +1,4 @@ -#!@PYTHON@ +#!@PYTHON2@ # The contents of this file are subject to the MonetDB Public License # Version 1.1 (the "License"); you may not use this file except in _______________________________________________ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
