Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
scord
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
eu
ADMIRE
scord
Commits
788837cd
Verified
Commit
788837cd
authored
1 year ago
by
Alberto Miranda
Browse files
Options
Downloads
Patches
Plain Diff
CMake: Tests now use own `scord.conf` instead of `/etc/scord.conf`
parent
adfa4df0
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!102
Resolve "Tests require `scord.conf` to exist in `/etc`"
Pipeline
#3869
passed
1 year ago
Stage: build
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
examples/CMakeLists.txt
+3
-5
3 additions, 5 deletions
examples/CMakeLists.txt
examples/scord.conf.in
+13
-0
13 additions, 0 deletions
examples/scord.conf.in
with
16 additions
and
5 deletions
examples/CMakeLists.txt
+
3
−
5
View file @
788837cd
...
...
@@ -30,20 +30,18 @@ if(SCORD_BUILD_TESTS)
set
(
TEST_DIRECTORY
"
${
SCORD_TESTS_DIRECTORY
}
/scord_daemon"
)
file
(
MAKE_DIRECTORY
${
TEST_DIRECTORY
}
)
set
(
TEST_ENV
)
list
(
APPEND TEST_ENV SCORD_LOG_OUTPUT=
${
TEST_DIRECTORY
}
/scord_daemon.log
)
configure_file
(
scord.conf.in scord.conf
)
set
(
SCORD_ADDRESS_STRING
${
SCORD_TRANSPORT_PROTOCOL
}
://
${
SCORD_BIND_ADDRESS
}
:
${
SCORD_BIND_PORT
}
)
add_test
(
start_scord_daemon
${
CMAKE_SOURCE_DIR
}
/scripts/runner.sh start scord.pid
${
CMAKE_BINARY_DIR
}
/src/scord/scord -f
${
CMAKE_BINARY_DIR
}
/src/scord/scord -f
-c
${
CMAKE_CURRENT_BINARY_DIR
}
/scord.conf
)
set_tests_properties
(
start_scord_daemon
PROPERTIES FIXTURES_SETUP scord_daemon
ENVIRONMENT
"
${
TEST_ENV
}
"
)
PROPERTIES FIXTURES_SETUP scord_daemon
)
add_test
(
stop_scord_daemon
${
CMAKE_SOURCE_DIR
}
/scripts/runner.sh stop TERM scord.pid
...
...
This diff is collapsed.
Click to expand it.
examples/scord.conf.in
0 → 100644
+
13
−
0
View file @
788837cd
## vim: set filetype=yaml:
## global service settings
global_settings
:
# log file
logfile
:
"
@TEST_DIRECTORY@/scord_daemon.log"
# path to pidfile
rundir
:
"
@TEST_DIRECTORY@"
# address to bind to
address
:
"
@SCORD_TRANSPORT_PROTOCOL@://@SCORD_BIND_ADDRESS@:@SCORD_BIND_PORT@"
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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