X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fatlocal.in;h=53602258cd9d3e33af9f52582aa4e4d763059c47;hb=d441e1b3e9286126818b46ddf2ee06a313e7c2d0;hp=aa86251cf8fa1409bad05f492f3b1e11a4fb634c;hpb=67e96a5dca90225358936b1392bba8b3207805b1;p=openvswitch diff --git a/tests/atlocal.in b/tests/atlocal.in index aa86251c..53602258 100644 --- a/tests/atlocal.in +++ b/tests/atlocal.in @@ -2,7 +2,10 @@ HAVE_OPENSSL='@HAVE_OPENSSL@' HAVE_PYTHON='@HAVE_PYTHON@' PERL='@PERL@' -PYTHON='@PYTHON@' + +if test x"$PYTHON" = x; then + PYTHON='@PYTHON@' +fi PYTHONPATH=$abs_top_srcdir/python:$abs_top_builddir/tests:$PYTHONPATH export PYTHONPATH @@ -10,11 +13,22 @@ export PYTHONPATH PYTHONIOENCODING=utf_8 export PYTHONIOENCODING +# PYTHONDONTWRITEBYTECODE=yes keeps Python 2.6+ from creating .pyc and .pyo +# files. Creating .py[co] works OK for any given version of Open +# vSwitch, but it causes trouble if you switch from a version with +# foo/__init__.py into an (older) version with plain foo.py, since +# foo/__init__.pyc will cause Python to ignore foo.py. +# +# Python before version 2.6 always creates .pyc files, so if you develop +# with such an older version then you're out of luck. +PYTHONDONTWRITEBYTECODE=yes +export PYTHONDONTWRITEBYTECODE + if test $HAVE_PYTHON = yes; then if python -m argparse 2>/dev/null; then : else PYTHONPATH=$PYTHONPATH:$abs_top_srcdir/python/compat export PYTHONPATH - fi + fi fi