From 5a906b0a757d5231506e01122e95e660a5f45851 Mon Sep 17 00:00:00 2001 From: Rafael Monnerat <rafael@nexedi.com> Date: Wed, 27 Aug 2014 12:56:47 +0200 Subject: [PATCH] slapos-testing: Use explicitly the python provided by the buildout --- software/slapos-testing/instance.cfg | 6 +++--- software/slapos-testing/software.cfg | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/software/slapos-testing/instance.cfg b/software/slapos-testing/instance.cfg index 2faf44be2..f94d76610 100644 --- a/software/slapos-testing/instance.cfg +++ b/software/slapos-testing/instance.cfg @@ -29,7 +29,7 @@ repository = ${slapos.core-repository:location} [slapos.core-setup] recipe = plone.recipe.command -command = echo "Updating setup...";cd $${slapos.core:location}; export PATH="$${slapos-test-runner:prepend-path}:$PATH"; export CPPFLAGS="$${environment:CPPFLAGS}"; export LDFLAGS="$${environment:LDFLAGS}"; export PYTHONPATH="$${environment:PYTHONPATH}"; python setup.py test -n; python setup.py test -n; python setup.py test -n; python setup.py test -n +command = echo "Updating setup...";cd $${slapos.core:location}; export PATH="$${slapos-test-runner:prepend-path}:$PATH"; export CPPFLAGS="$${environment:CPPFLAGS}"; export LDFLAGS="$${environment:LDFLAGS}"; export PYTHONPATH="$${environment:PYTHONPATH}"; ${python2.7:location}/bin/python setup.py test -n; ${python2.7:location}/bin/python setup.py test -n; ${python2.7:location}/bin/python setup.py test -n; ${python2.7:location}/bin/python setup.py test -n update-command = $${:command} [slapos.package] @@ -54,7 +54,7 @@ repository = ${erp5-util-repository:location} [erp5.util-setup] recipe = plone.recipe.command -command = echo "Updating setup...";cd $${erp5-util:location}; export PATH="$${slapos-test-runner:prepend-path}:$PATH"; export CPPFLAGS="$${environment:CPPFLAGS}"; export LDFLAGS="$${environment:LDFLAGS}"; export PYTHONPATH="$${environment:PYTHONPATH}"; python setup.py test -n; python setup.py test -n; python setup.py test -n; python setup.py test -n; python setup.py test -n +command = echo "Updating setup...";cd $${erp5-util:location}; export PATH="$${slapos-test-runner:prepend-path}:$PATH"; export CPPFLAGS="$${environment:CPPFLAGS}"; export LDFLAGS="$${environment:LDFLAGS}"; export PYTHONPATH="$${environment:PYTHONPATH}"; ${python2.7:location}/bin/python setup.py test -n; ${python2.7:location}/bin/python setup.py test -n; ${python2.7:location}/bin/python setup.py test -n; ${python2.7:location}/bin/python setup.py test -n; ${python2.7:location}/bin/python setup.py test -n update-command = $${:command} [officejs] @@ -88,7 +88,7 @@ environment = environment CPPFLAGS = -I${python2.7:location}/include/python2.7 -I${libxml2:location}/include -I${libxslt:location}/include LDFLAGS = -L${python2.7:location}/lib -L${libxml2:location}/lib -L${libxslt:location}/lib -L${libxslt:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${python2.7:location}/lib -Wl,-rpath=${libxml2:location}/lib -Wl,-rpath=${libxslt:location}/lib -Wl,-rpath=${zlib:location}/lib LD_LIBRARY_PATH = ${python2.7:location}/lib:${libxml2:location}/lib:${libxslt:location}/lib:${libxslt:location}/lib:${zlib:location}/lib -PYTHONPATH = ${python-setuptools:pythonpath} +PYTHONPATH = ${python-setuptools:pythonpath}:${buildout:eggs-directory} [sh-environment] # Section exposes testing default environment as sh file. It is thus easy diff --git a/software/slapos-testing/software.cfg b/software/slapos-testing/software.cfg index cae1fdfbc..1c53488ca 100644 --- a/software/slapos-testing/software.cfg +++ b/software/slapos-testing/software.cfg @@ -83,7 +83,7 @@ repository = http://git.erp5.org/repos/jio.git [template] recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance.cfg -md5sum = eeb79239f685b0cc31d313f726c38d17 +md5sum = 5353f353380acb91d2f3ea704418e202 output = ${buildout:directory}/template.cfg mode = 640 -- 2.30.9