[taler-grid5k] 135/141: remove sanitizer again

[gnunet]

This is an automated email from the git hooks/post-receive script.

marco-boss pushed a commit to branch master
in repository grid5k.

commit 212ba7ba539e8c34dcbf5599b1915e6c5447520d
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Sun Nov 14 10:34:57 2021 +0100

    remove sanitizer again
---
 experiment/scripts/benchmark.sh | 18 +++++++++---------
 experiment/scripts/wallet.sh    | 11 ++++++-----
 experiment/setup.sh             |  2 +-
 image/taler-debian11.yaml       |  4 ++--
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/experiment/scripts/benchmark.sh b/experiment/scripts/benchmark.sh
index c02b48d..46cd20a 100755
--- a/experiment/scripts/benchmark.sh
+++ b/experiment/scripts/benchmark.sh
@@ -11,13 +11,13 @@ esac
 taler-wallet-cli \
     -L ${LOG_LEVEL} \
     advanced bench1 \
-      --config-json '
+      --config-json "
 {
-  "exchange": "http://${PROXY_DOMAIN}/";, 
-  "bank": "http://${BANK_DOMAIN}/";,
-  "currency": "KUDOS",
-  "payto": "payto://x-taler-bank/${BANK_DOMAIN}/foo",
-  "iterations": 100000,
-  "deposits": 10,
-  "restartWallet": 20
-}'
+  \"exchange\": \"http://${PROXY_DOMAIN}/\";, 
+  \"bank\": \"http://${BANK_DOMAIN}/\";,
+  \"currency\": \"KUDOS\",
+  \"payto\": \"payto://x-taler-bank/${BANK_DOMAIN}/foo\",
+  \"iterations\": 100000,
+  \"deposits\": 10,
+  \"restartWallet\": 20
+}"
diff --git a/experiment/scripts/wallet.sh b/experiment/scripts/wallet.sh
index d2990b7..64c53b8 100755
--- a/experiment/scripts/wallet.sh
+++ b/experiment/scripts/wallet.sh
@@ -27,12 +27,13 @@ case "$1" in
   stop)
     if [[ "${NUM_PROCESSES}" = "logging" ]]; then
       systemctl stop taler-wallet@logging.service
+    else
+      let "START=${RUNNING}-${NUM_PROCESSES}+1"
+      for i in $(seq ${START} ${RUNNING})
+      do
+        systemctl stop taler-wallet@${i}.service
+      done
     fi
-    let "START=${RUNNING}-${NUM_PROCESSES}+1"
-    for i in $(seq ${START} ${RUNNING})
-    do
-      systemctl stop taler-wallet@${i}.service
-    done
     ;;
   start|init)
     CPU_USAGE=$[100-$(vmstat 1 2 | tail -1 | awk '{print $15}')]
diff --git a/experiment/setup.sh b/experiment/setup.sh
index fc378eb..4655a9e 100644
--- a/experiment/setup.sh
+++ b/experiment/setup.sh
@@ -39,7 +39,7 @@ if ! grep -Fxq "server=/${DNS_ZONE}/${NS_IP}" 
/etc/dnsmasq.conf ; then
   echo "server=/${DNS_ZONE}/${NS_IP}" >> /etc/dnsmasq.conf 
   # Read grid5k DNS servers from resolv.conf and add them to dnsmasq
   grep nameserver /etc/resolv.conf | \
-    awk '{print "server=/grid5000.fr/"$2}' \
+    awk '{print "server="$2}' \
     >> /etc/dnsmasq.conf
 fi
 
diff --git a/image/taler-debian11.yaml b/image/taler-debian11.yaml
index 76d2e0a..873ef81 100644
--- a/image/taler-debian11.yaml
+++ b/image/taler-debian11.yaml
@@ -103,7 +103,7 @@ setup:
 
          tar -xvf $${gnunet_tar}
          cd gnunet-* 
-         CFLAGS="-O0 -g" ./configure --enable-logging=verbose --prefix=/usr 
--enable-sanitizer
+         CFLAGS="-O0 -g" ./configure --enable-logging=verbose --prefix=/usr # 
--enable-sanitizer
          make install
          ldconfig
 
@@ -116,7 +116,7 @@ setup:
          pip install jinja2
          tar -xvf $${exchange_tar}
          cd taler-exchange*
-         CFLAGS="-O0 -g" ./configure --enable-logging=verbose --prefix=/usr 
--enable-sanitizer
+         CFLAGS="-O0 -g" ./configure --enable-logging=verbose --prefix=/usr # 
--enable-sanitizer
          make install
          ldconfig
 

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.