From 0ce7603a4de1030a32d7a9d50f97b22cf1513693 Mon Sep 17 00:00:00 2001
From: John Hodge <tpg@ucc.asn.au>
Date: Mon, 18 Oct 2021 20:54:23 +0800
Subject: [PATCH] Gitlab CI - Debugging
---
.gitlab-ci.yml | 9 ++++++++-
tests/_common.sh | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6f6de61..2a7aa1c 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 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() {
--
GitLab