From: John Hodge Date: Mon, 18 Oct 2021 12:54:23 +0000 (+0800) Subject: Gitlab CI - Debugging X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=HEAD;p=tpg%2Fopendispense2.git Gitlab CI - Debugging --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6f6de61..49af60d 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: @@ -33,3 +34,6 @@ test: - chmod u+s dispense script: - cd tests && su -c './TEST_basic.sh' testuser + artifacts: + paths: + - tests/rundir/** diff --git a/tests/_common.sh b/tests/_common.sh index e43a2c8..0f62430 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() {