Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
5
Merge Requests
5
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jérome Perrin
slapos
Commits
a93e5d87
Commit
a93e5d87
authored
Dec 22, 2022
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
beremiz-ide: add testdata folder to test env
parent
685ac27d
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
8 deletions
+8
-8
software/beremiz-ide/buildout.hash.cfg
software/beremiz-ide/buildout.hash.cfg
+3
-3
software/beremiz-ide/instance-beremiz-test.cfg.jinja2.in
software/beremiz-ide/instance-beremiz-test.cfg.jinja2.in
+1
-2
software/beremiz-ide/instance-beremiz.cfg.jinja2.in
software/beremiz-ide/instance-beremiz.cfg.jinja2.in
+0
-2
software/beremiz-ide/instance.cfg.in
software/beremiz-ide/instance.cfg.in
+1
-0
software/beremiz-ide/software.cfg
software/beremiz-ide/software.cfg
+3
-1
No files found.
software/beremiz-ide/buildout.hash.cfg
View file @
a93e5d87
...
@@ -15,15 +15,15 @@
...
@@ -15,15 +15,15 @@
[instance]
[instance]
filename = instance.cfg.in
filename = instance.cfg.in
md5sum = e
ac5155a458c8a2f37959833caa9d9fe
md5sum = e
d2bd38b78f2a66f474205249f6e6f2c
[template-instance-beremiz]
[template-instance-beremiz]
filename = instance-beremiz.cfg.jinja2.in
filename = instance-beremiz.cfg.jinja2.in
md5sum =
880a96ad5679b075a0681a6b1233f58
2
md5sum =
200de2b44431c0e4154227b333f2734
2
[template-instance-beremiz-test]
[template-instance-beremiz-test]
filename = instance-beremiz-test.cfg.jinja2.in
filename = instance-beremiz-test.cfg.jinja2.in
md5sum =
34bf185731d479021f0c4472b5e524e
0
md5sum =
0ada07a808a644e3d24b7dc9e7db74b
0
[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 @
a93e5d87
...
@@ -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}
...
...
software/beremiz-ide/instance-beremiz.cfg.jinja2.in
View file @
a93e5d87
...
@@ -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}
...
...
software/beremiz-ide/instance.cfg.in
View file @
a93e5d87
...
@@ -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
software/beremiz-ide/software.cfg
View file @
a93e5d87
...
@@ -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
...
...
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