From b8bdcc78122ed39846fda788119d879ff6b9b0ae Mon Sep 17 00:00:00 2001
From: Marcello Stanisci <marcello.stanisci@inria.fr>
Date: Fri, 17 Jun 2016 13:44:45 +0200
Subject: lcov for merchant

---
 taler-build/coverage.sh | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

(limited to 'taler-build')

diff --git a/taler-build/coverage.sh b/taler-build/coverage.sh
index 2ed3df8..d1f8c6a 100755
--- 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
-- 
cgit v1.2.3


From 687ff4ba59628f752530de8a8226838acceff8f8 Mon Sep 17 00:00:00 2001
From: Marcello Stanisci <marcello.stanisci@inria.fr>
Date: Fri, 17 Jun 2016 13:57:23 +0200
Subject: bash syntax fix

---
 taler-build/coverage.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'taler-build')

diff --git a/taler-build/coverage.sh b/taler-build/coverage.sh
index d1f8c6a..33bca81 100755
--- a/taler-build/coverage.sh
+++ b/taler-build/coverage.sh
@@ -4,7 +4,7 @@ export CFLAGS="-g -O0"
 export PATH=$HOME/local/bin:$PATH
 CONFIGURE="./configure --prefix=$HOME/local --with-gnunet=$HOME/local --with-microhttpd=$HOME/local --enable-coverage"
 
-for comp in exchange merchant do
+for comp in exchange merchant; do
   cd $HOME/$comp
   git pull
   ./bootstrap
-- 
cgit v1.2.3


From db696908036703449cc1a70bcdec9b796abb18cd Mon Sep 17 00:00:00 2001
From: Marcello Stanisci <marcello.stanisci@inria.fr>
Date: Fri, 17 Jun 2016 17:20:18 +0200
Subject: not using absolute paths (when executing binaries) in scripts called
 by buildbot

---
 taler-build/switch_active.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'taler-build')

diff --git a/taler-build/switch_active.sh b/taler-build/switch_active.sh
index bc64ed6..6d9f375 100755
--- a/taler-build/switch_active.sh
+++ b/taler-build/switch_active.sh
@@ -24,8 +24,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 ]]
-- 
cgit v1.2.3