Commit a93e5d87 authored by Alain Takoudjou's avatar Alain Takoudjou

beremiz-ide: add testdata folder to test env

parent 685ac27d
...@@ -15,15 +15,15 @@ ...@@ -15,15 +15,15 @@
[instance] [instance]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = eac5155a458c8a2f37959833caa9d9fe md5sum = ed2bd38b78f2a66f474205249f6e6f2c
[template-instance-beremiz] [template-instance-beremiz]
filename = instance-beremiz.cfg.jinja2.in filename = instance-beremiz.cfg.jinja2.in
md5sum = 880a96ad5679b075a0681a6b1233f582 md5sum = 200de2b44431c0e4154227b333f27342
[template-instance-beremiz-test] [template-instance-beremiz-test]
filename = instance-beremiz-test.cfg.jinja2.in filename = instance-beremiz-test.cfg.jinja2.in
md5sum = 34bf185731d479021f0c4472b5e524e0 md5sum = 0ada07a808a644e3d24b7dc9e7db74b0
[template-fluxbox-menu.in] [template-fluxbox-menu.in]
filename = fluxbox-menu.in filename = fluxbox-menu.in
......
...@@ -30,9 +30,8 @@ environment = ...@@ -30,9 +30,8 @@ environment =
[beremiz-env.sh] [beremiz-env.sh]
# Add openssl needed to build matiec during tests # Add openssl needed to build matiec during tests
inline += inline +=
#export OPENSSL_CRYPTO_LIBRARY={{ openssl_location }}/lib
#export OPENSSL_INCLUDE_DIR={{ openssl_location }}/include
export OPENSSL_ROOT_DIR={{ openssl_location }} export OPENSSL_ROOT_DIR={{ openssl_location }}
export TESSDATAPATH={{ tesseract_data }}
[runTestSuite] [runTestSuite]
env.sh = ${beremiz-env.sh:output} env.sh = ${beremiz-env.sh:output}
......
...@@ -219,8 +219,6 @@ inline = ...@@ -219,8 +219,6 @@ inline =
export LD_LIBRARY_PATH={{ mesa_location }}/lib export LD_LIBRARY_PATH={{ mesa_location }}/lib
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 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 GTK_THEME=Materia
export GTK_PATH={{ gtk_materia_theme }}
export HOME=${buildout:directory} export HOME=${buildout:directory}
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}
......
...@@ -87,3 +87,4 @@ extra-context = ...@@ -87,3 +87,4 @@ extra-context =
raw opencv_location {{ opencv_location }} raw opencv_location {{ opencv_location }}
raw openssl_location {{ openssl_location }} raw openssl_location {{ openssl_location }}
raw nxdtest_dir {{ buildout_directory }} raw nxdtest_dir {{ buildout_directory }}
raw tesseract_data {{ tesseract_location }}/share/tessdata
...@@ -22,6 +22,7 @@ extends = ...@@ -22,6 +22,7 @@ extends =
../../component/xorg/buildout.cfg ../../component/xorg/buildout.cfg
../../component/pytest/buildout.cfg ../../component/pytest/buildout.cfg
../../component/opencv/buildout.cfg ../../component/opencv/buildout.cfg
../../component/tesseract/buildout.cfg
../../component/xterm/buildout.cfg ../../component/xterm/buildout.cfg
../../stack/monitor/buildout.cfg ../../stack/monitor/buildout.cfg
../../stack/nxdtest.cfg ../../stack/nxdtest.cfg
...@@ -93,7 +94,7 @@ eggs += ...@@ -93,7 +94,7 @@ eggs +=
[beremiz] [beremiz]
recipe = slapos.recipe.build:download-unpacked recipe = slapos.recipe.build:download-unpacked
# download beremiz at revision caee3ad3b7bb2865c77328de5ffdaeec61dbf49f # download beremiz from github
url = https://github.com/beremiz/beremiz/archive/caee3ad3b7bb2865c77328de5ffdaeec61dbf49f.tar.gz url = https://github.com/beremiz/beremiz/archive/caee3ad3b7bb2865c77328de5ffdaeec61dbf49f.tar.gz
md5sum = 52f9407e1706cdecf01fabfc61090276 md5sum = 52f9407e1706cdecf01fabfc61090276
...@@ -151,6 +152,7 @@ context = ...@@ -151,6 +152,7 @@ context =
key opencv_location opencv:location key opencv_location opencv:location
key openssl_location openssl:location key openssl_location openssl:location
key sikulix_bin sikuli:output key sikulix_bin sikuli:output
key tesseract_location tesseract:location
key xdotool_location xdotool:location key xdotool_location xdotool:location
key xserver_location xserver:location key xserver_location xserver:location
key xterm_location xterm:location key xterm_location xterm:location
......
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