diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6f6de61d2d78ff5e11df203cfcbb58ac8af7d730..2a7aa1cb7357fa477a4d9b05ca246cb0723ac23a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,7 +9,8 @@ build: # instead of calling g++ directly you can also use some build toolkit like make # install the necessary build tools when needed before_script: - - apt update && apt -y install libncurses-dev libmodbus-dev libsqlite3-dev libident-dev + - apt update + - apt -y install libncurses-dev libmodbus-dev libsqlite3-dev libident-dev script: - make -C src/ artifacts: @@ -31,5 +32,11 @@ test: - useradd testuser && chown -R testuser . # SETUID on the client, so it can use AUTOAUTH (ident doesn't work on the container) - chmod u+s dispense + - ls -l dispense script: - cd tests && su -c './TEST_basic.sh' testuser + after_script: + - cat tests/rundir/basic/server.log + artifacts: + paths: + - tests/rundir/basic/server.log diff --git a/tests/_common.sh b/tests/_common.sh index e43a2c8c1611e3558d87f3a6bc2127ae4f9a591d..0f6243027fb92553c89212a9cc5a51f673a33b4f 100644 --- a/tests/_common.sh +++ b/tests/_common.sh @@ -44,7 +44,7 @@ TRY_COMMAND() { DISPENSE="../dispense -f /dev/null -H localhost -P ${PORT}" -LD_LIBRARY_PATH=.. ../dispsrv -f ${BASEDIR}cfg_server.conf --dont-daemonise > ${BASEDIR}server.log 2>&1 & +LD_LIBRARY_PATH=.. ../dispsrv -f ${BASEDIR}cfg_server.conf --dont-daemonise -d 2 > ${BASEDIR}server.log 2>&1 & server_pid=$! cleanup() {