Commit 85025788 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent a3c09f9d
...@@ -13,6 +13,7 @@ setup = ${pygolang-repository:location} ...@@ -13,6 +13,7 @@ setup = ${pygolang-repository:location}
[pygolang-repository] [pygolang-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = https://lab.nexedi.com/nexedi/pygolang.git repository = https://lab.nexedi.com/nexedi/pygolang.git
branch = master
location = ${buildout:parts-directory}/pygolang-dev location = ${buildout:parts-directory}/pygolang-dev
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
# SlapOS software release to test pygolang on Nexedi testing infrastructure # SlapOS software release to test pygolang on Nexedi testing infrastructure.
[buildout] [buildout]
extends = extends =
...@@ -14,14 +14,20 @@ parts = ...@@ -14,14 +14,20 @@ parts =
instance.cfg instance.cfg
# XXX temp
[pygolang-repository]
repository = https://lab.nexedi.com/kirr/pygolang.git
branch = x/nxdtest
# tune pygolang to install with all and for-tests extras. # tune pygolang to install with all and for-tests extras.
[pygolang] [pygolang]
egg = pygolang[all_test] egg = pygolang[all_test]
# bin/python is preinstalled with sys.path to pygolang & friends. # bin/python is preinstalled with sys.path to pygolang & friends.
# use [gpython], instead of [pygolang], since interpreter works only for regular # Adjust [gpython], instead of [pygolang], since interpreter works only for regular
# zc.recipe.egg, not zc.recipe.egg:custom used by [pygolang]. # zc.recipe.egg, not zc.recipe.egg:custom used by [pygolang].
# the `python` interpreter will just set sys.path to pygolang _without_ activating gevent. # The `python` interpreter will just set sys.path to pygolang _without_ activating gevent.
[gpython] [gpython]
interpreter = python interpreter = python
......
...@@ -22,7 +22,9 @@ context = ...@@ -22,7 +22,9 @@ context =
section buildout buildout section buildout buildout
section nxdtest nxdtest section nxdtest nxdtest
key env_sh :env.sh key env_sh :env.sh
key workdir :workdir
# XXX env.sh - must be provided by user XXX or default empty? # XXX env.sh - must be provided by user XXX or default empty?
# XXX workdir ----/----
[nxdtest] [nxdtest]
......
...@@ -24,5 +24,7 @@ t = ${:home}/t ...@@ -24,5 +24,7 @@ t = ${:home}/t
[runTestSuite] [runTestSuite]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
wrapper-path = ${directory:bin}/${:_buildout_section_name_} wrapper-path = ${directory:bin}/${:_buildout_section_name_}
command-line = /bin/bash -c '. {{ env_sh }} && cd ${directory:t} && {{ nxdtest['exe'] }} "$@"' nxdtest # XXX way to run nxdtest out of tree? (for neotest)
#command-line = /bin/bash -c '. {{ env_sh }} && cd ${directory:t} && {{ nxdtest['exe'] }} "$@"' nxdtest
command-line = /bin/bash -c '. {{ env_sh }} && cd {{ workdir }} && {{ nxdtest['exe'] }} "$@"' nxdtest
# "$@" is implicitly added to argv # "$@" is implicitly added to argv
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