Browse Source

test-network.sh: Use "/bin/echo -n" rather than builtin echo

The default shell on OS X is bash, which has a builtin echo. When called
in "sh" mode, this echo does not accept "-n". This patch uses "/bin/echo -n"
instead.

Partially fixes issue 13161.
teor 9 years ago
parent
commit
7c0215f8ca
2 changed files with 7 additions and 2 deletions
  1. 3 0
      changes/bug13161-test-network-echo-n
  2. 4 2
      src/test/test-network.sh

+ 3 - 0
changes/bug13161-test-network-echo-n

@@ -0,0 +1,3 @@
+  o Minor bugfixes:
+    - Stop using "echo -n", as some shells' built-in echo doesn't support
+      "-n". Instead, use "/bin/echo -n". Partially fixes bug 13161.

+ 4 - 2
src/test/test-network.sh

@@ -1,5 +1,7 @@
 #! /bin/sh
 
+ECHO_N="/bin/echo -n"
+
 until [ -z $1 ]
 do
   case $1 in
@@ -40,8 +42,8 @@ PATH="$TOR_DIR/src/or:$TOR_DIR/src/tools:$PATH"
 # Sleep some, waiting for the network to bootstrap.
 # TODO: Add chutney command 'bootstrap-status' and use that instead.
 BOOTSTRAP_TIME=18
-echo -n "$myname: sleeping for $BOOTSTRAP_TIME seconds"
+$ECHO_N "$myname: sleeping for $BOOTSTRAP_TIME seconds"
 n=$BOOTSTRAP_TIME; while [ $n -gt 0 ]; do
-    sleep 1; n=$(expr $n - 1); echo -n .
+    sleep 1; n=$(expr $n - 1); $ECHO_N .
 done; echo ""
 ./chutney verify $CHUTNEY_NETWORK