diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-02-10 10:13:59 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-02-10 10:13:59 +0100 |
| commit | 6d0cfa312e825753c07fbd00aa0da5810302465f (patch) | |
| tree | 7bb77e5ed47294be3362cbcdd7439d3ec60b5686 /tests/python8.test | |
| parent | c383211ab93ae36b3d9485da4101852db74ce0cc (diff) | |
| parent | 6366a170d89eaaf6c3f119dc999035eb7d5a5800 (diff) | |
| download | automake-6d0cfa312e825753c07fbd00aa0da5810302465f.tar.gz | |
Merge branch 'python-tests-extend'
Conflicts:
tests/Makefile.am
tests/Makefile.in
tests/python11.test
tests/python2.test
tests/python8.test
tests/python9.test
Diffstat (limited to 'tests/python8.test')
| -rwxr-xr-x | tests/python8.test | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/python8.test b/tests/python8.test index 8ed3c3dfd..981e64d54 100755 --- a/tests/python8.test +++ b/tests/python8.test @@ -19,8 +19,9 @@ required=python . ./defs || Exit 1 -cat >>configure.in <<EOF -AM_PATH_PYTHON(, [echo 'GREP ME' >&2]) +cat >>configure.in <<'EOF' +# $PYTHON is supposed to be properly set in ACTION-IF-TRUE. +AM_PATH_PYTHON(, [$PYTHON -V >py-version 2>&1]) AC_OUTPUT EOF @@ -30,8 +31,7 @@ $ACLOCAL $AUTOCONF $AUTOMAKE --add-missing -./configure 2>stderr || { cat stderr >&2; Exit 1; } -cat stderr >&2 -grep 'GREP ME' stderr +./configure +grep '^Python [0-9]\.[0-9][0-9]*\.[0-9]' py-version : |