diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-11-19 22:19:21 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-11-19 22:58:38 +0100 |
| commit | e1acf4a06f5a8d9e861455ac29abb4944a446494 (patch) | |
| tree | 4396eedc2e2ee75d09444338c60cfc84624a8086 /t/py-compile-destdir.sh | |
| parent | 3fea76478eb1364093804365904fdb3c1e5c93d2 (diff) | |
| download | automake-e1acf4a06f5a8d9e861455ac29abb4944a446494.tar.gz | |
python tests: support PEP-3147 installation layout
This fixes several spurious testsuite failures with python >= 3.2,
introduced by recent commit v1.12.4-43-ge0e99ed, "python: improve
support for modern python (CPython 3.2 and PyPy)".
* t/ax/am-test-lib.sh (python_has_pep3147, pyc_location, py_installed):
New functions.
($am_pep3147_tag): New variable.
* t/py-compile-basic2.sh: Deleted, too difficult to adapt for the
gain it would offer; move the still relevant parts ...
* t/py-compile-basic.sh: ... here. Adapt and adjust the rest of
the test as well.
* t/nobase-python.sh: Adapt and adjust.
* t/py-compile-basedir.sh: Likewise.
* t/py-compile-destdir.sh: Likewise.
* t/py-compile-option-terminate.sh: Likewise.
* t/python-pr10995.sh: Likewise.
* t/python-virtualenv.sh: Likewise.
* t/python10.sh: Likewise.
* t/python12.sh: Likewise.
* t/python3.sh: Likewise.
* t/list-of-tests.mk: Adjust list of tests.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/py-compile-destdir.sh')
| -rwxr-xr-x | t/py-compile-destdir.sh | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/t/py-compile-destdir.sh b/t/py-compile-destdir.sh index 4d303d532..ba666f6f9 100755 --- a/t/py-compile-destdir.sh +++ b/t/py-compile-destdir.sh @@ -1,4 +1,4 @@ -#! /bin/sh + #! /bin/sh # Copyright (C) 2011-2012 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify @@ -31,13 +31,17 @@ echo 'def foo (): return "foo"' > $destdir/foo.py echo 'def bar (): return "bar"' > $destdir/sub/bar.py ./py-compile --destdir $destdir foo.py sub/bar.py -ls -l $destdir $destdir/sub # For debugging. -ls . sub | grep '\.py[co]$' && exit 1 -test -f $destdir/foo.pyc -test -f $destdir/foo.pyo -test -f $destdir/sub/bar.pyc -test -f $destdir/sub/bar.pyo -strings $destdir/*.py[co] $destdir/sub/*.py[co] || : # For debugging. -$FGREP $destdir $destdir/*.py[co] $destdir/sub/*.py[co] && exit 1 + +find $destdir # For debugging. +st=0 +for x in c o; do + for b in foo sub/bar; do + f=$(pyc_location -p "$destdir/$b.py$x") + test -f "$f" + strings "$f" || : # For debugging. + $FGREP $destdir $f && { echo BAD: $f; st=1; } + done +done +exit $st : |