From 0749196612c0442c6ea42fec33c1e464ecf86dee Mon Sep 17 00:00:00 2001
From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Wed, 23 May 2007 22:24:47 +0000
Subject: [PATCH] cecho changes in UML scripts

---
 testing/do-tests               | 5 +++--
 testing/scripts/function.sh    | 4 ++--
 testing/scripts/kstart-umls    | 4 ++--
 testing/scripts/start-switches | 4 ++--
 testing/stop-testing           | 4 ++--
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/testing/do-tests b/testing/do-tests
index 537a4398e..d085a05a4 100755
--- a/testing/do-tests
+++ b/testing/do-tests
@@ -565,12 +565,13 @@ do
 	# write test status to html file
 	#
 
-	cecho "$STATUS"
 	if [ $STATUS = "passed" ]
 	then
 	    COLOR="green"
+	    cecho "\033[1;32m$STATUS"
 	else
 	    COLOR="red"
+	    cecho "$STATUS"
 	fi
 
 	cat >> $TESTRESULTSHTML << @EOF
@@ -630,7 +631,7 @@ cat >> $INDEX << @EOF
 @EOF
 
 cecho ""
-cecho "Passed:   $passed_cnt"
+cecho "\033[1;32mPassed:   $passed_cnt"
 cecho "Failed:   $failed_cnt"
 cecho ""
 
diff --git a/testing/scripts/function.sh b/testing/scripts/function.sh
index 22a79698d..aa944924c 100755
--- a/testing/scripts/function.sh
+++ b/testing/scripts/function.sh
@@ -22,11 +22,11 @@
 #
 
 function cecho {
-    echo -e "\033\13301;31m$1\033\1330m"
+    echo -e "\033[1;31m$1\033[0m"
 }
 
 function cecho-n {
-    echo -en "\033\13301;31m$1\033\1330m"
+    echo -en "\033[1;31m$1\033[0m"
 }
 
 
diff --git a/testing/scripts/kstart-umls b/testing/scripts/kstart-umls
index 8379438c8..eeaa959e8 100755
--- a/testing/scripts/kstart-umls
+++ b/testing/scripts/kstart-umls
@@ -68,7 +68,7 @@ do
 	    ubda=$UMLHOSTFS \
 	    \$SWITCH_${host} \
 	    mem=${MEM}M con=pty con0=fd:0,fd:1" &
-        cecho "done"
+        cecho "\033[1;32mdone"
     fi
     let "x0+=dx"
     let "y0+=dy"
@@ -114,7 +114,7 @@ do
 	cecho "exit"
 	exit 1
     else
-	cecho "up"
+	cecho "\033[1;32mup"
     fi
 done
 
diff --git a/testing/scripts/start-switches b/testing/scripts/start-switches
index 82433babe..c9cafafc1 100755
--- a/testing/scripts/start-switches
+++ b/testing/scripts/start-switches
@@ -31,9 +31,9 @@ do
 	cecho " * Great, umlswitch$n is already running!"
     else
 	cecho-n " * Starting umlswitch$n.."
-	uml_switch -hub -tap tap$n -unix /tmp/umlswitch$n >/dev/null </dev/null &
+	uml_switch -tap tap$n -unix /tmp/umlswitch$n >/dev/null </dev/null &
 	sleep 2
 	eval ifconfig "tap$n \$IFCONFIG_$n up"
-	cecho "done"
+	cecho "\033[1;32mdone"
     fi
 done
diff --git a/testing/stop-testing b/testing/stop-testing
index 5b53505ac..7b21c6b07 100755
--- a/testing/stop-testing
+++ b/testing/stop-testing
@@ -39,7 +39,7 @@ for host in $HOSTS
 do
     uml_mconsole $host halt &> /dev/null
 done
-cecho "done"
+cecho "\033[1;32mdone"
 
 #####################################################
 # Shutting down the uml switches
@@ -47,5 +47,5 @@ cecho "done"
 cecho-n " * Stopping the UML switches.."
 killall uml_switch &> /dev/null
 rm -f /tmp/umlswitch[012] &> /dev/null 2>&1
-cecho "done"
+cecho "\033[1;32mdone"