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: move integration test script

Browse source
This commit is contained in:
Steffen Vogel 2017-07-14 16:30:49 +02:00
parent 98eed183e3
commit 77201b6813
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
packaging/rpm/Makefile.inc
View file

@ -10,12 +10,12 @@
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# any later version.
#
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
###################################################################################
@ -54,7 +54,7 @@ rpm-libwebsockets: | $(RPMDIR)/RPMS/x86_64/ $(BUILDDIR)/thirdparty/libwebsockets
mv $(BUILDDIR)/thirdparty/libwebsockets/RPM/RPMS/x86_64/libwebsockets-*.rpm $(RPMDIR)/RPMS/x86_64/
# We patch version number and release fields of the spec file based on the current Git commit
$(SPEC_VILLAS): $(SRCDIR)/packaging/rpm/villas-node.spec | $$(dir $$@)
$(SPEC_VILLAS): packaging/rpm/villas-node.spec | $$(dir $$@)
sed -e "s/§VERSION§/$(VERSION_NUM)/g" \
-e "s/§RELEASE§/1.$(subst -,_,$(GIT_BRANCH))_$(subst -,_,$(VARIANT)).$(shell date +%Y%m%d)git$(GIT_REV)/g" < $^ > $@

6
tests/integration/Makefile.inc
View file

@ -10,12 +10,12 @@
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# any later version.
#
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
###################################################################################
@ -23,4 +23,4 @@
integration-tests: src tools
run-integration-tests: integration-tests
@$(SRCDIR)/tests/integration-tests.sh
@$(SRCDIR)/tests/integration/run.sh

14
tests/integration-tests.sh → tests/integration/run.sh
View file

@ -25,16 +25,16 @@
SCRIPT=$(realpath ${BASH_SOURCE[0]})
SCRIPTPATH=$(dirname $SCRIPT)
export SRCDIR=$(realpath ${SCRIPTPATH}/..)
export SRCDIR=$(realpath ${SCRIPTPATH}/../..)
export BUILDDIR=${SRCDIR}/build/release
export LOGDIR=${BUILDDIR}/tests/integration
export PATH=${BUILDDIR}:${PATH}
# Default values
VERBOSE=0
FILTER='*'
NUM_SAMPLES=100
TIMEOUT=5m
VERBOSE=${VERBOSE:-0}
FILTER=${FILTER:-'*'}
NUM_SAMPLES=${NUM_SAMPLES:-100}
TIMEOUT=${TIMEOUT:-5m}
# Parse command line arguments
while getopts ":f:l:t:v" OPT; do
@ -107,7 +107,7 @@ for TEST in ${TESTS}; do
FAILED=$((${FAILED} + 1))
;;
esac
TOTAL=$((${TOTAL} + 1))
done
@ -120,4 +120,4 @@ if (( ${FAILED} > 0 )); then
else
echo -e "\nSummary: all tests passed!"
exit 0
fi
fi