Merge branch 'python-tests-extend'

Conflicts:
	tests/Makefile.am
	tests/Makefile.in
	tests/python11.test
	tests/python2.test
	tests/python8.test
	tests/python9.test

1 files changed, 9 insertions, 7 deletions

diff --git a/tests/python2.test b/tests/python2.test
index 62c4a6960..4403dda57 100755
--- a/tests/python2.test
+++ b/tests/python2.test
@@ -18,6 +18,7 @@
 
 . ./defs || Exit 1
 
+$ACLOCAL
 
 echo 1. pythondir not defined
 
@@ -26,8 +27,8 @@ PYTHON = x
 python_PYTHON = foo.py
 END
 
-$ACLOCAL
 AUTOMAKE_fails -a
+grep 'pythondir.*undefined' stderr
 grep AM_PATH_PYTHON stderr
 
 
@@ -38,8 +39,8 @@ PYTHON = x
 pkgpython_PYTHON = foo.py
 END
 
-$ACLOCAL
 AUTOMAKE_fails -a
+grep 'pkgpythondir.*undefined' stderr
 grep AM_PATH_PYTHON stderr
 
 
@@ -50,8 +51,8 @@ PYTHON = x
 pyexec_PYTHON = foo.py
 END
 
-$ACLOCAL
 AUTOMAKE_fails -a
+grep 'pyexecdir.*undefined' stderr
 grep AM_PATH_PYTHON stderr
 
 
@@ -62,8 +63,8 @@ PYTHON = x
 pkgpyexec_PYTHON = foo.py
 END
 
-$ACLOCAL
 AUTOMAKE_fails -a
+grep 'pkgpyexecdir.*undefined' stderr
 grep AM_PATH_PYTHON stderr
 
 
@@ -74,8 +75,8 @@ pkgpyexecdir = /here/we/go
 pkgpyexec_PYTHON = foo.py
 END
 
-$ACLOCAL
 AUTOMAKE_fails -a
+grep 'PYTHON.*undefined' stderr
 grep AM_PATH_PYTHON stderr
 
 
@@ -87,7 +88,7 @@ pkgpyexecdir = /here/we/go
 pkgpyexec_PYTHON = foo.py
 END
 
-$ACLOCAL
+rm -f py-compile
 $AUTOMAKE -a
 test -f py-compile
 
@@ -100,5 +101,6 @@ fubardir = /here/we/go
 fubar_PYTHON = foo.py
 END
 
-$ACLOCAL
 $AUTOMAKE -a
+
+: