Commit 13aa7293 authored by Alberto Miranda's avatar Alberto Miranda ♨️
Browse files

Merge branch '145-tests-require-scord-conf-to-exist-in-etc' into 'main' 

Resolve "Tests require `scord.conf` to exist in `/etc`"

Closes #145

See merge request !102
parents adfa4df0 788837cd

examples/CMakeLists.txt

+3 −5
Original line number Original line Diff line number Diff line
@@ -30,20 +30,18 @@ if(SCORD_BUILD_TESTS) 
  set(TEST_DIRECTORY "${SCORD_TESTS_DIRECTORY}/scord_daemon")

  set(TEST_DIRECTORY "${SCORD_TESTS_DIRECTORY}/scord_daemon")

  file(MAKE_DIRECTORY ${TEST_DIRECTORY})

  file(MAKE_DIRECTORY ${TEST_DIRECTORY})





  set(TEST_ENV)

  configure_file(scord.conf.in scord.conf)

  list(APPEND TEST_ENV SCORD_LOG_OUTPUT=${TEST_DIRECTORY}/scord_daemon.log)





  set(SCORD_ADDRESS_STRING

  set(SCORD_ADDRESS_STRING

    ${SCORD_TRANSPORT_PROTOCOL}://${SCORD_BIND_ADDRESS}:${SCORD_BIND_PORT})

    ${SCORD_TRANSPORT_PROTOCOL}://${SCORD_BIND_ADDRESS}:${SCORD_BIND_PORT})





  add_test(start_scord_daemon

  add_test(start_scord_daemon

    ${CMAKE_SOURCE_DIR}/scripts/runner.sh start scord.pid

    ${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

  set_tests_properties(start_scord_daemon

    PROPERTIES FIXTURES_SETUP scord_daemon

    PROPERTIES FIXTURES_SETUP scord_daemon)

    ENVIRONMENT "${TEST_ENV}")





  add_test(stop_scord_daemon

  add_test(stop_scord_daemon

    ${CMAKE_SOURCE_DIR}/scripts/runner.sh stop TERM scord.pid

    ${CMAKE_SOURCE_DIR}/scripts/runner.sh stop TERM scord.pid

examples/scord.conf.in

0 → 100644
+13 −0
Original line number Original line Diff line number Diff line 
## 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@"