Commit a715aabc authored by Alain Takoudjou's avatar Alain Takoudjou

beremiz-ide: openssl is needed to build matiec during tests

parent a2af2c8c
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
[instance] [instance]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = fd556a0cb44610f0b0898b7126bd77b2 md5sum = db7fe97f4c6b84cfadb7b5c68eab517a
[template-instance-beremiz] [template-instance-beremiz]
filename = instance-beremiz.cfg.jinja2.in filename = instance-beremiz.cfg.jinja2.in
...@@ -23,7 +23,7 @@ md5sum = c92317d0d754f62d3259136d1a0df1ac ...@@ -23,7 +23,7 @@ md5sum = c92317d0d754f62d3259136d1a0df1ac
[template-instance-beremiz-test] [template-instance-beremiz-test]
filename = instance-beremiz-test.cfg.jinja2.in filename = instance-beremiz-test.cfg.jinja2.in
md5sum = ff7cf06927041f6aec5ad559950b69cb md5sum = a2fa2b9d3a225a1dd71db67bd4fea769
[template-fluxbox-menu.in] [template-fluxbox-menu.in]
filename = fluxbox-menu.in filename = fluxbox-menu.in
......
...@@ -21,6 +21,13 @@ environment = ...@@ -21,6 +21,13 @@ environment =
XORG_LOCK_DIR=${xserver:lock-dir} XORG_LOCK_DIR=${xserver:lock-dir}
DISPLAY=${xserver:display} DISPLAY=${xserver:display}
[beremiz-env.sh]
# Add openssl needed to build matiec during tests
inline +=
#export OPENSSL_CRYPTO_LIBRARY={{ openssl_location }}/lib
#export OPENSSL_INCLUDE_DIR={{ openssl_location }}/include
export OPENSSL_ROOT_DIR={{ openssl_location }}
[runTestSuite] [runTestSuite]
env.sh = ${beremiz-env.sh:output} env.sh = ${beremiz-env.sh:output}
workdir = {{ nxdtest_dir }} workdir = {{ nxdtest_dir }}
......
...@@ -82,4 +82,5 @@ extra-context = ...@@ -82,4 +82,5 @@ extra-context =
raw instance_nxdtest {{ nxdtest_template }} raw instance_nxdtest {{ nxdtest_template }}
raw xdotool_bin {{ xdotool_location }}/bin/xdotool raw xdotool_bin {{ xdotool_location }}/bin/xdotool
raw opencv_location {{ opencv_location }} raw opencv_location {{ opencv_location }}
raw openssl_location {{ openssl_location }}
raw nxdtest_dir {{ buildout_directory }} raw nxdtest_dir {{ buildout_directory }}
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