commit 4fb33db4b8c14a254588f5a9064e72fa78e1b4f1
parent 13639df5cb692ebc79ba58ae7d5e6738ea2bc2b1
Author: Marcello Stanisci <marcello.stanisci@inria.fr>
Date: Fri, 17 Jun 2016 22:56:41 +0200
Merge branch 'master' of ssh://taler.net/var/git/deployment
Diffstat:
5 files changed, 26 insertions(+), 17 deletions(-)
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
@@ -83,7 +83,8 @@ globalSwitcher.addStep(ShellCommand(name="switcher",
description="Invalidating timestamps",
descriptionDone="timestamps invalidated",
command=["./switch_active.sh"],
- workdir="build/taler-build"))
+ workdir="build/taler-build",
+ env={'PATH': "${HOME}/bin:${PATH}"}))
lcov = BuildFactory()
lcov.addStep(Git(repourl='git://git.taler.net/deployment.git',
mode='full',
diff --git a/etc/nginx/sites-enabled/lcov-ssl.site b/etc/nginx/sites-enabled/lcov-ssl.site
@@ -18,7 +18,7 @@ server {
add_header Strict-Transport-Security "max-age=63072000; preload";
location / {
- autoindex off;
+ autoindex on;
ssi off;
# ssi_last_modified on;
}
diff --git a/etc/nginx/sites-enabled/lcov.site b/etc/nginx/sites-enabled/lcov.site
@@ -9,7 +9,7 @@ server {
server_name www.lcov.taler.net;
location / {
- autoindex off;
+ autoindex on;
ssi off;
# ssi_last_modified on;
}
diff --git a/taler-build/coverage.sh b/taler-build/coverage.sh
@@ -2,15 +2,23 @@
# Run from 'exchange/' top-level directory to generate code coverage data.
export CFLAGS="-g -O0"
export PATH=$HOME/local/bin:$PATH
-cd $HOME/exchange/
-git pull
-./bootstrap
-./configure --prefix=$HOME/local --with-gnunet=$HOME/local --with-microhttpd=$HOME/local --enable-coverage
-make clean install
-TOP=`pwd`
-mkdir -p doc/coverage/
-lcov -d $TOP -z
-make check || exit 1
-lcov -d $TOP -c --no-external -o doc/coverage/coverage.info
-lcov -r doc/coverage/coverage.info **/test_* **/perf_* -o doc/coverage/rcoverage.info
-genhtml -o doc/coverage doc/coverage/rcoverage.info
+CONFIGURE="./configure --prefix=$HOME/local --with-gnunet=$HOME/local --with-microhttpd=$HOME/local --enable-coverage"
+
+for comp in exchange merchant; do
+ cd $HOME/$comp
+ git pull
+ ./bootstrap
+ if test $comp = 'merchant'; then
+ $CONFIGURE "--with-exchange=$HOME/local"
+ else
+ $CONFIGURE
+ fi
+ make clean install
+ TOP=$(pwd)
+ mkdir -p doc/coverage/
+ lcov -d $TOP -z
+ make check || exit 1
+ lcov -d $TOP -c --no-external -o doc/coverage/coverage.info
+ lcov -r doc/coverage/coverage.info **/test_* -o doc/coverage/rcoverage.info
+ genhtml -o doc/coverage doc/coverage/rcoverage.info
+done
diff --git a/taler-build/switch_active.sh b/taler-build/switch_active.sh
@@ -26,8 +26,8 @@ fi
# build and restart
# FIXME calling 'make check' before switching still missing
-$HOME/deployment/bin/taler-deployment-build
-$HOME/deployment/bin/taler-deployment-restart
+taler-deployment-build
+taler-deployment-restart
# check exit code
if [[ $? == 0 ]]
