commit 647f432ff1c6ddea92bb0d365ce2e3039174ab82
parent 313c80e5c249460c61f93c7d298d9aa023119831
Author: Matyja Lukas Adam <lukas.matyja@students.bfh.ch>
Date: Tue, 19 Dec 2023 11:50:57 +0100
[testing] some changes
Diffstat:
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/testing/donau-unified-setup.sh b/src/testing/donau-unified-setup.sh
@@ -76,7 +76,7 @@ START_BANK=0
START_TRANSFER=0
START_WIREWATCH=0
USE_ACCOUNT="exchange-account-1"
-USE_VALGRIN=""
+USE_VALGRIND=""
WIRE_DOMAIN="x-taler-bank"
CONF_ORIG="$HOME/.config/taler.conf"
LOGLEVEL="DEBUG"
@@ -194,7 +194,7 @@ fi
if [ "1" = "$START_DONAU" ]
then
echo -n "Testing for Donau"
- donau-httpd -h > /dev/null || ext_skip " donau-httpd required"
+ donau-httpd -h > /dev/null || exit_skip " donau-httpd required"
echo " FOUND"
fi
@@ -226,6 +226,7 @@ then
echo " FOUND"
fi
+DONAU_URL=$(donau-config -c "$CONF" -s "DONAU" -o "BASE_URL")
EXCHANGE_URL=$(taler-config -c "$CONF" -s "EXCHANGE" -o "BASE_URL")
CURRENCY=$(taler-config -c "$CONF" -s "TALER" -o "CURRENCY")
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
@@ -29,21 +29,21 @@ libdonauutil_la_LIBADD = \
-lm
EXTRA_DIST = \
- taler-config.in
+ donau-config.in
bin_SCRIPTS = \
- taler-config
+ donau-config
edit_script = $(SED) -e 's,%libdir%,$(libdir),'g $(NULL)
-taler-config: taler-config.in
+donau-config: donau-config.in
rm -f $@ $@.tmp && \
$(edit_script) $< >$@.tmp && \
chmod a-w+x $@.tmp && \
mv $@.tmp $@
CLEANFILES = \
- taler-config
+ donau-config
libdonauutil_la_LDFLAGS = \
-version-info 0:0:0 \