[ooo-build-commit] .: bin/run-tests.sh test/ooxml

[Thorsten Behrens]

 bin/run-tests.sh       |   13 ++++++++++---
 test/ooxml/download.sh |    3 ++-
 2 files changed, 12 insertions(+), 4 deletions(-)

New commits:
commit 568a8878370dacc0fbf510fbfb6f94b1220bbd0a
Author: Thorsten Behrens <thb at openoffice.org>
Date:   Tue Aug 24 12:26:44 2010 +0200

    Adapted 'make test' to repo changes, added term color
    
    * bin/run-tests.sh: added term color
    * test/ooxml/download.sh: new contrib repo, md5-summed officeotron
    * test/ooxml/run.sh: removed verbose log output

diff --git a/bin/run-tests.sh b/bin/run-tests.sh
index 4a23241..f17fed5 100755
--- a/bin/run-tests.sh
+++ b/bin/run-tests.sh
@@ -19,17 +19,24 @@ ooinstall=$1
 
 TESTDIR=$TOOLSDIR/test/
 
+if [ -n $COLORTERM ]; then
+	RED="\033[31m"
+	GREEN="\033[32m"
+	ORANGE="\033[33m"
+	CLEAR="\033[0m"
+fi
+
 for t in `ls -1 $TESTDIR`
 do
     # Is there a run.sh executable script inside?
     if test -x $TESTDIR/$t/run.sh ; then
         sh $TESTDIR/$t/run.sh "$ooinstall" "$TOOLSDIR"
         if test $? ; then
-            echo -e "$t\t:\tPASSED"
+            echo -e "$t\t:\t${GREEN}PASSED${CLEAR}"
         else
-            echo -e "$t\t:\tFAILED" 
+            echo -e "$t\t:\t${RED}FAILED${CLEAR}"
         fi
     else
-        echo -e "$t\t:\tSKIPPED"
+        echo -e "$t\t:\t${ORANGE}SKIPPED${CLEAR}"
     fi
 done
diff --git a/test/ooxml/download.sh b/test/ooxml/download.sh
index 3ad2515..02f3037 100755
--- a/test/ooxml/download.sh
+++ b/test/ooxml/download.sh
@@ -15,7 +15,8 @@ fi
 # TODO Replace by the SVN copy once the patch is integrated upstream
 #      http://code.google.com/p/officeotron/issues/detail?id=6
 OFFICEOTRON=officeotron-0.5.5-Beta.jar
+OFFICEOTRONMD5=7b70b7955b7289a8d1502e9c0abf8302
 if test ! -a $SRCDIR/$OFFICEOTRON ; then
     cd $SRCDIR
-    wget "http://people.freedesktop.org/~cbosdo/$OFFICEOTRON" -O $OFFICEOTRON
+    wget "http://download.go-oo.org/$OFFICEOTRONMD5-$OFFICEOTRON" -O $OFFICEOTRON
 fi