cecho changes in UML scripts
authorAndreas Steffen <andreas.steffen@strongswan.org>
Wed, 23 May 2007 22:24:47 +0000 (22:24 -0000)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Wed, 23 May 2007 22:24:47 +0000 (22:24 -0000)
testing/do-tests
testing/scripts/function.sh
testing/scripts/kstart-umls
testing/scripts/start-switches
testing/stop-testing

index 537a439..d085a05 100755 (executable)
@@ -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 ""
 
index 22a7969..aa94492 100755 (executable)
 #
 
 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"
 }
 
 
index 8379438..eeaa959 100755 (executable)
@@ -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
 
index 82433ba..c9cafaf 100755 (executable)
@@ -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
index 5b53505..7b21c6b 100755 (executable)
@@ -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"