Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
hxcomm
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
EBRAINS RI
Tech Hub
Apps
BrainScaleS
hxcomm
Commits
882ec0b3
Commit
882ec0b3
authored
5 years ago
by
Yannik Stradmann
Committed by
Yannik Stradmann
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Cleanup hardware test handling
Change-Id: I0c205acb519a714de46a7548e5a8c973de957303
parent
637ecab7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.ci/Jenkinsfile
+2
-0
2 additions, 0 deletions
.ci/Jenkinsfile
tests/hw/hxcomm/main.cpp
+2
-1
2 additions, 1 deletion
tests/hw/hxcomm/main.cpp
wscript
+5
-1
5 additions, 1 deletion
wscript
with
9 additions
and
2 deletions
.ci/Jenkinsfile
+
2
−
0
View file @
882ec0b3
...
@@ -2,5 +2,7 @@
...
@@ -2,5 +2,7 @@
wafDefaultPipeline
(
projects:
[
"hxcomm"
],
wafDefaultPipeline
(
projects:
[
"hxcomm"
],
container:
[
app:
"visionary-dls"
],
container:
[
app:
"visionary-dls"
],
testSlurmResource:
[
partition:
"cube"
,
gres:
"cube1"
,
licenses:
"W4F3"
],
testOptions:
"--test-execall -j1"
,
notificationChannel:
"#dls-software"
,
notificationChannel:
"#dls-software"
,
warningsIgnorePattern:
"*/lib-rcf/*"
)
warningsIgnorePattern:
"*/lib-rcf/*"
)
This diff is collapsed.
Click to expand it.
tests/hw/hxcomm/main.cpp
+
2
−
1
View file @
882ec0b3
...
@@ -29,7 +29,8 @@ int main(int argc, char* argv[])
...
@@ -29,7 +29,8 @@ int main(int argc, char* argv[])
namespace
bpo
=
boost
::
program_options
;
namespace
bpo
=
boost
::
program_options
;
bpo
::
options_description
desc
(
"Options"
);
bpo
::
options_description
desc
(
"Options"
);
// clang-format off
// clang-format off
desc
.
add_options
()(
"fpga_ip"
,
bpo
::
value
<
std
::
string
>
(
&
fpga_ip
)
->
required
());
// Currently (2019-05-14) the only setup, still ugly -> issue #3161
desc
.
add_options
()(
"fpga_ip"
,
bpo
::
value
<
std
::
string
>
(
&
fpga_ip
)
->
default_value
(
"192.168.4.4"
));
// clang-format on
// clang-format on
bpo
::
variables_map
vm
;
bpo
::
variables_map
vm
;
...
...
This diff is collapsed.
Click to expand it.
wscript
+
5
−
1
View file @
882ec0b3
#!/usr/bin/env python
#!/usr/bin/env python
import
os
from
waflib.extras.test_base
import
summary
from
waflib.extras.test_base
import
summary
def
depends
(
dep
):
def
depends
(
dep
):
dep
(
'
sctrltp
'
)
dep
(
'
sctrltp
'
)
dep
(
'
lib-rcf
'
)
dep
(
'
lib-rcf
'
)
...
@@ -31,6 +33,8 @@ def configure(conf):
...
@@ -31,6 +33,8 @@ def configure(conf):
def
build
(
bld
):
def
build
(
bld
):
bld
.
env
.
DLSvx_HARDWARE_AVAILABLE
=
"
cube
"
==
os
.
environ
.
get
(
"
SLURM_JOB_PARTITION
"
)
bld
(
target
=
'
hx_comm_inc
'
,
bld
(
target
=
'
hx_comm_inc
'
,
export_includes
=
'
include
'
export_includes
=
'
include
'
)
)
...
@@ -131,7 +135,7 @@ def build(bld):
...
@@ -131,7 +135,7 @@ def build(bld):
target
=
'
hx_comm_hwtests
'
,
target
=
'
hx_comm_hwtests
'
,
features
=
'
gtest cxx cxxprogram
'
,
features
=
'
gtest cxx cxxprogram
'
,
source
=
bld
.
path
.
ant_glob
(
'
tests/hw/hxcomm/test-*.cpp
'
),
source
=
bld
.
path
.
ant_glob
(
'
tests/hw/hxcomm/test-*.cpp
'
),
skip_run
=
True
,
skip_run
=
not
bld
.
env
.
DLSvx_HARDWARE_AVAILABLE
,
test_main
=
'
tests/hw/hxcomm/main.cpp
'
,
test_main
=
'
tests/hw/hxcomm/main.cpp
'
,
use
=
[
'
hx_comm
'
,
'
hx_comm_tests_helper
'
,
'
hx_comm_hwtests_inc
'
],
use
=
[
'
hx_comm
'
,
'
hx_comm_tests_helper
'
,
'
hx_comm_hwtests_inc
'
],
)
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment