Commit 6be08f69 authored by Jérome Perrin's avatar Jérome Perrin

slapos-testing: we have no other ways that keeping /usr/bin and /bin in $PATH

parent b6d0584a
...@@ -16,5 +16,5 @@ ...@@ -16,5 +16,5 @@
[template] [template]
filename = instance.cfg filename = instance.cfg
md5sum = 015b3e5df957b71b0b935c0685df4e5c md5sum = 724c776cc8decfc3da861246be4092f1
...@@ -63,9 +63,15 @@ repository = ${slapos.toolbox-repository:location} ...@@ -63,9 +63,15 @@ repository = ${slapos.toolbox-repository:location}
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
wrapper-path = $${create-directory:bin}/runTestSuite wrapper-path = $${create-directory:bin}/runTestSuite
command-line = command-line =
bash -c "PATH=${coreutils:location}/bin:${curl:location}/bin:${openssl:location}/bin:${git:location}/bin:${libxslt:location}/bin:$PATH ${buildout:bin-directory}/runTestSuite ${buildout:bin-directory}/runTestSuite
--python_interpreter=${buildout:bin-directory}/${eggs:interpreter} --python_interpreter=${buildout:bin-directory}/${eggs:interpreter}
--source_code_path_list=$${caucase:location},$${erp5.util:location},$${slapos.cookbook:location},$${slapos.core:location},$${slapos.recipe.build:location},$${slapos.recipe.cmmi:location},$${slapos.recipe.template:location},$${slapos.toolbox:location}" --source_code_path_list=$${caucase:location},$${erp5.util:location},$${slapos.cookbook:location},$${slapos.core:location},$${slapos.recipe.build:location},$${slapos.recipe.cmmi:location},$${slapos.recipe.template:location},$${slapos.toolbox:location}
environment =
# XXX slapos.cookbook:wrapper does not seem to allow "extending" PATH. Tests
# needs ping, which is a setuid binary that cannot be installed via slapos
# way of building software without root access, so we keep "standard"
# /usr/bin and /bin in $PATH
PATH=${coreutils:location}/bin:${curl:location}/bin:${openssl:location}/bin:${git:location}/bin:${libxslt:location}/bin:/usr/bin/:/bin/
[phantomjs-wrapper] [phantomjs-wrapper]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment