Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
104
Merge Requests
104
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
a715aabc
Commit
a715aabc
authored
Sep 30, 2022
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
beremiz-ide: openssl is needed to build matiec during tests
parent
a2af2c8c
Pipeline
#23864
failed with stage
in 0 seconds
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
2 deletions
+10
-2
software/beremiz-ide/buildout.hash.cfg
software/beremiz-ide/buildout.hash.cfg
+2
-2
software/beremiz-ide/instance-beremiz-test.cfg.jinja2.in
software/beremiz-ide/instance-beremiz-test.cfg.jinja2.in
+7
-0
software/beremiz-ide/instance.cfg.in
software/beremiz-ide/instance.cfg.in
+1
-0
No files found.
software/beremiz-ide/buildout.hash.cfg
View file @
a715aabc
...
@@ -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
...
...
software/beremiz-ide/instance-beremiz-test.cfg.jinja2.in
View file @
a715aabc
...
@@ -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 }}
...
...
software/beremiz-ide/instance.cfg.in
View file @
a715aabc
...
@@ -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 }}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment