Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

tests: fix invocation of integration tests

Browse source
This commit is contained in:
Steffen Vogel 2018-03-26 17:29:30 +02:00
parent b405a60670
commit 7ed5a7fcbe
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -115,6 +115,8 @@ VPATH = $(SRCDIR)
VERSION := $(shell git describe --tags --abbrev=0 --match 'v*')
VERSION_NUM := $(shell VERSION=$(VERSION); echo $${VERSION:1})
export BUILDDIR VARIANT VERSION VERSION_NUM
ifdef CI
VARIANT := $(VARIANT)-ci

8
tools/integration-tests.sh
View file

@ -25,12 +25,8 @@
SCRIPT=$(realpath ${BASH_SOURCE[0]})
SCRIPTPATH=$(dirname $SCRIPT)
if [ -n "${DEBUG}" ]; then
VARIANT="debug"
else
VARIANT="release"
fi
VARIANTS=${VARIANTS:-"release"}
VARIANT=${VARIANT:-$(uname -s)-$(uname -m)-$(echo ${VARIANTS} | tr ' ' '_')}
SRCDIR=${SRCDIR:-$(realpath ${SCRIPTPATH}/..)}
BUILDDIR=${BUILDDIR:-${SRCDIR}/build/${VARIANT}}