Commit 113e06b8 authored by Alain Takoudjou's avatar Alain Takoudjou

Beremiz-ide: fix missing cmake while running tests

parent b7d638e3
...@@ -15,11 +15,11 @@ ...@@ -15,11 +15,11 @@
[instance] [instance]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = c4079d70ab3268234651bf6c36234b2f md5sum = fd556a0cb44610f0b0898b7126bd77b2
[template-instance-beremiz] [template-instance-beremiz]
filename = instance-beremiz.cfg.jinja2.in filename = instance-beremiz.cfg.jinja2.in
md5sum = 51071494633f4ffba700baf935dc6955 md5sum = c92317d0d754f62d3259136d1a0df1ac
[template-instance-beremiz-test] [template-instance-beremiz-test]
filename = instance-beremiz-test.cfg.jinja2.in filename = instance-beremiz-test.cfg.jinja2.in
......
...@@ -179,7 +179,7 @@ wrapper-path = ${directory:services}/fluxbox ...@@ -179,7 +179,7 @@ wrapper-path = ${directory:services}/fluxbox
recipe = slapos.recipe.template recipe = slapos.recipe.template
inline = inline =
export LD_LIBRARY_PATH={{ mesa_location }}/lib export LD_LIBRARY_PATH={{ mesa_location }}/lib
export PATH=${directory:bin}:{{ git_bin_dir }}:{{ autoconf_bin }}:{{ automake_bin }}:{{ matiec_location }}/bin:{{ bison_location }}/bin:{{ flex_location }}/bin:{{ bin_directory }}:{{ gcc_location }}/bin:$PATH export PATH=${directory:bin}:{{ git_bin_dir }}:{{ cmake_bin }}:{{ autoconf_bin }}:{{ automake_bin }}:{{ matiec_location }}/bin:{{ bison_location }}/bin:{{ flex_location }}/bin:{{ bin_directory }}:{{ gcc_location }}/bin:$PATH
export XDG_DATA_DIR={{ gtk3_location }}/share export XDG_DATA_DIR={{ gtk3_location }}/share
export GSETTINGS_SCHEMA_DIR={{ gtk3_location }}/share/glib-2.0/schemas export GSETTINGS_SCHEMA_DIR={{ gtk3_location }}/share/glib-2.0/schemas
export FONTCONFIG_FILE=${font-config:output} export FONTCONFIG_FILE=${font-config:output}
......
...@@ -46,6 +46,7 @@ filename = instance-beremiz.cfg ...@@ -46,6 +46,7 @@ filename = instance-beremiz.cfg
extra-context = extra-context =
raw autoconf_bin {{ autoconf_location }}/bin raw autoconf_bin {{ autoconf_location }}/bin
raw automake_bin {{ automake_location }}/bin raw automake_bin {{ automake_location }}/bin
raw cmake_bin {{ cmake_location }}/bin
raw bash_bin {{ bash_location }}/bin/bash raw bash_bin {{ bash_location }}/bin/bash
raw beremiz_location {{ beremiz_location }} raw beremiz_location {{ beremiz_location }}
raw bison_location {{ bison_location }} raw bison_location {{ bison_location }}
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
extends = extends =
../../stack/slapos.cfg ../../stack/slapos.cfg
../../component/autoconf/buildout.cfg ../../component/autoconf/buildout.cfg
../../component/cmake/buildout.cfg
../../component/flex/buildout.cfg ../../component/flex/buildout.cfg
../../component/fonts/buildout.cfg ../../component/fonts/buildout.cfg
../../component/noVNC/buildout.cfg ../../component/noVNC/buildout.cfg
...@@ -108,6 +109,7 @@ type = beremiz ...@@ -108,6 +109,7 @@ type = beremiz
context = context =
key autoconf_location autoconf:location key autoconf_location autoconf:location
key automake_location automake:location key automake_location automake:location
key cmake_location cmake:location
key bash_location bash:location key bash_location bash:location
key beremiz_location beremiz-setup:setup key beremiz_location beremiz-setup:setup
key bin_directory buildout:bin-directory key bin_directory buildout:bin-directory
......
...@@ -32,6 +32,11 @@ eggs += ...@@ -32,6 +32,11 @@ eggs +=
[instance] [instance]
type = beremiz-test type = beremiz-test
# Download only open62541 sources because beremiz test needs
# sources and will rebuild it anyway.
[open62541]
recipe = slapos.recipe.build:download-unpacked
[gen-nxdtest.sh] [gen-nxdtest.sh]
recipe = slapos.recipe.template recipe = slapos.recipe.template
output = ${buildout:parts-directory}/gennxdtest.sh output = ${buildout:parts-directory}/gennxdtest.sh
......
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