CI: run installcheck tests with and without Valgrind

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8cf5d40e0ca354caf80cece54c413e0f5e11f4bb..a1696fec019fa2fc089f3f3e661af89c91791447 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,6 +36,16 @@ test:linux:amd64:
     - linux
     - amd64
 
+installcheck:linux:amd64:
+  stage: test
+  script:
+    - PREFIX=$(pwd)/.local make -k installcheck
+  dependencies:
+    - build:linux:amd64
+  tags:
+    - docker
+    - linux
+    - amd64
 
 deckard:linux:amd64:
   stage: test
@@ -48,6 +58,16 @@ deckard:linux:amd64:
     - linux
     - amd64
 
+installcheck:valgrind:linux:amd64:
+  stage: test
+  script:
+    - DEBUGGER="valgrind --leak-check=full --trace-children=yes --quiet --suppressions=/lj.supp" PREFIX=$(pwd)/.local make -k installcheck
+  dependencies:
+    - build:linux:amd64
+  tags:
+    - docker
+    - linux
+    - amd64
 
 # temporarily disabled - we need to fix issues first
 #deckard:linux:amd64:valgrind:

diff --git a/tests/config/runtest.sh b/tests/config/runtest.sh
index 6f4b3809b22ff51a4ca62c6ab25c7ca689552be1..d1ad7ae514deb572fca759f3852b24f53063c38d 100755 (executable)
--- a/tests/config/runtest.sh
+++ b/tests/config/runtest.sh
@@ -1,11 +1,11 @@
 #!/bin/sh -e
-export TMP_RUNDIR=`mktemp -d`
+export TMP_RUNDIR="$(mktemp -d)"
 function finish {
-  rm -rf ${TMP_RUNDIR}
+  rm -rf "${TMP_RUNDIR}"
 }
 trap finish EXIT
 
 echo "config-test: ${2}"
-cp tests/config/${2}/* ${TMP_RUNDIR}/
-cp tests/config/test_utils.lua ${TMP_RUNDIR}/
-KRESD_NO_LISTEN=1 ${1} -f 1 -c test.cfg ${TMP_RUNDIR}
\ No newline at end of file
+cp "tests/config/${2}/"* "${TMP_RUNDIR}/"
+cp tests/config/test_utils.lua "${TMP_RUNDIR}/"
+KRESD_NO_LISTEN=1 ${DEBUGGER} ${1} -f 1 -c test.cfg "${TMP_RUNDIR}"

diff --git a/tests/config/test_config.mk b/tests/config/test_config.mk
index 8d9f1e03f29dddf43cf8a5145e17742ce100746c..25ea28d98fa20b2ab04a5179bb0839f729d20702 100644 (file)
--- a/tests/config/test_config.mk
+++ b/tests/config/test_config.mk
@@ -12,7 +12,7 @@ tests_config := \
 
 define make_config_test
 test-config-$(1): tests/config/$(1)/test.cfg check-install-precond
-       @$(preload_syms) $(DEBUGGER) ./tests/config/runtest.sh $(abspath $(SBINDIR)/kresd) $(1)
+       @$(preload_syms) ./tests/config/runtest.sh $(abspath $(SBINDIR)/kresd) $(1)
 .PHONY: test-$(1)
 endef