bug 785396: fix AOT reporting problems, "foun.found appears in xml result and compile errors appear in wrong testcase name (r=trbaker pending)"
authorDan Schaffer <Dan.Schaffer@adobe.com>
Fri, 24 Aug 2012 12:34:13 -0700
changeset 7533 d8af20a76a67e25a20e25012ae4618aa199ff3d0
parent 7532 0f1a8318e89530201354f90c0b5691b859e99da4
child 7534 1bda92ad2f0a3d6e8835ad6296e5f5895c2a6588
push id4257
push userdschaffe@adobe.com
push dateThu, 06 Sep 2012 14:36:05 +0000
reviewerstrbaker
bugs785396, 1104700
bug 785396: fix AOT reporting problems, "foun.found appears in xml result and compile errors appear in wrong testcase name (r=trbaker pending)" CL@1104700
test/acceptance/runtests.py
test/util/convertAcceptanceToJunit.py
--- a/test/acceptance/runtests.py
+++ b/test/acceptance/runtests.py
@@ -297,16 +297,17 @@ class AcceptanceRuntest(RuntestBase):
                         outputCalls.append((self.js_print, ('   FAILED passes: 0 fails: 1 unexpected passes: 0 expected failures: 0', '', '<br/>')))
                     else:
                         self.allpasses += 1
                         outputCalls.append((self.verbose_print, ('   PASSED passes: 1 fails: 0 unexpected passes: 0 expected failures: 0', '', '<br/>')))
                     outputCalls.insert(0,(self.js_print,('%d running %s' % (testnum, ast), '<b>', '</b><br/>')));
                     return outputCalls
                 else:
                     self.allfails += 1
+                    outputCalls.insert(0,(self.js_print,('%d running %s' % (testnum, ast), '<b>', '</b><br/>')));
                     outputCalls.append((self.js_print, ('%s' % '\n'.join(compileOutput),)))
                     outputCalls.append((self.fail,(testName, 'FAILED! file did not compile: %s' %
                                                    testName, self.failmsgs)))
                     return outputCalls
 
         if self.runSource or self.eval:
             incfiles=self.build_incfiles(testName)
             # With eval, shell.as must come first
--- a/test/util/convertAcceptanceToJunit.py
+++ b/test/util/convertAcceptanceToJunit.py
@@ -489,17 +489,17 @@ def convertAcceptanceToJunit(infile,outf
         if line.startswith('avm version:'):
             properties['avmversion']=tokens[2]
         if line.startswith('thread count:'):
             properties['threadcount']=tokens[2]
         if line.startswith('Executing'):
             tests=tokens[1]
             if len(tokens)>5:
                properties['shell']=tokens[5]
-        if finishedTests==False and len(tokens)>2 and re.search('^[0-9.]+',line):
+        if finishedTests==False and len(tokens)>2 and re.search('^[0-9.]+',line) and tokens[1]!="error":
             totalfiles+=1
             if lastout!='' and len(testresults)>0:
                 testresults[len(testresults)-1]['out']+=lastout
             lastout=''
             testobj={}
             fullname=tokens[2:]
             testobj['class'],testobj['name'],testobj['time'],testobj['out']=parseName(toplevel,fullname)
             testresults.append(testobj)