Cosmetic changes to tester script

darcs-hash:20071218235958-f2ef6-85256e71258756e14651d2ac78e24d5e834fb0b8.gz

diff --git a/tests/tester.py b/tests/tester.py
index 94fe02ff70bcbdce19bc9af50222811bc4ce07e7..21b8b12f0b74dfab1510f0ed6776bced370e29af 100755 (executable)
--- a/tests/tester.py
+++ b/tests/tester.py
@@ -101,7 +101,7 @@ class ResultEntry:
         if self.exitcode == 0: color=''
         else:
             if self.exitcode == 1:   color=' bgcolor="red"'
-            elif self.exitcode == 2: color=' bgcolor="yellow"'
+            elif self.exitcode == 2: color=' bgcolor="gray"'
             else: color=' bgcolor="gray"'
         if self.stdout: stdoutlink="<a href='#stdout-%(tcname)s-%(rules)s'>stdout</a>" % self.__dict__
         else: stdoutlink=''
@@ -166,7 +166,7 @@ class RulesStat:
     def toHtml(self):
         if self.errors == 0 and self.canttest == 0: self.color=''
         elif self.errors != 0:   self.color=' bgcolor="red"'
-        elif self.canttest != 0: self.color=' bgcolor="yellow"'
+        elif self.canttest != 0: self.color=' bgcolor="gray"'
         else: self.color = ' bgcolor="gray"'
         s="""
   <tr%(color)s>
@@ -263,7 +263,7 @@ class TestCase:
 
     def run(self):
         self.results = TestCaseResult(self.name)
-        print "Testing %s:\n\t" % self.name,
+        print "Testing %s:\n" % self.name,
         os.chdir(os.path.join(testsRoot, self.directory))
 #         if os.path.exists("Makefile.test"):
 #             self._exec = self._execMake
@@ -273,7 +273,6 @@ class TestCase:
         for rules in self.rules:
             resultEntry = ResultEntry(self.name, rules)
             self.results[rules] = resultEntry
-            print rules,
             os.environ['OMK_RULES'] = rules
             filesBefore = self._getFileSet()
             self._copyRules(rules)
@@ -321,8 +320,14 @@ class TestCase:
     
     def _doRun(self, log):
         "Runs the teset in current directory."
+        print "    ",os.environ['OMK_RULES'],
+        sys.stdout.flush()
         ret = self._exec(log)
-        print ret,
+        if ret == 0: retstr = "OK"
+        elif ret == 1: retstr = "FAILED"
+        elif ret == 2: retstr = "--"
+        else: retstr = "???"
+        print "%*s%s" % (20-len(os.environ['OMK_RULES']), "", retstr)
 
 
 results = Results()