X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fruntests.py;h=213638dff9ed8f7d08892de1bc9d18e4b434fdcf;hb=a45eb97695095a4d73f2cda97bf5a6c76b41a7f8;hp=6e8e33e32a2a945c34c0961f2d0ac8c554e440f0;hpb=9bbaf82c590e28de95f6c7d89067cd0d687a4a07;p=swftools.git

diff --git a/lib/as3/runtests.py b/lib/as3/runtests.py
index 6e8e33e..213638d 100644
--- a/lib/as3/runtests.py
+++ b/lib/as3/runtests.py
@@ -24,6 +24,8 @@ import sys
 import os
 import time
 import subprocess
+import marshal
+from optparse import OptionParser
 
 def check(s):
     row = None
@@ -74,17 +76,54 @@ def runcmd(cmd,args,wait):
     fo.close()
     return ret,output
 
-class Test:
-    def __init__(self, nr, file):
+class Cache:
+    def __init__(self, filename):
+        try:
+            self.filename2status = marshal.load(open(filename, "rb"))
+        except IOError:
+            self.filename2status = {}
+
+    def parse_args(self):
+        parser = OptionParser()
+        parser.add_option("-d", "--diff", dest="diff", help="Only run tests that failed the last time",action="store_true")
+        (options, args) = parser.parse_args()
+        self.__dict__.update(options.__dict__)
+
+        self.checknum=-1
+        if len(args):
+            self.checknum = int(args[0])
+
+    @staticmethod
+    def load(filename):
+        return Cache(filename)
+
+    def save(self, filename):
+        fi = open(filename, "wb")
+        marshal.dump(self.filename2status, fi)
+        fi.close()
+
+    def highlight(self, nr, filename):
+        return self.checknum==nr
+
+    def skip_file(self, nr, filename):
+        if self.checknum>=0 and nr!=self.checknum:
+            return 1
+        if self.diff and self.filename2status[filename]=="ok":
+            return 1
+        return 0
+
+    def file_status(self, filename, status):
+        self.filename2status[filename] = status
+
+class TestBase:
+    def __init__(self, nr, file, run):
         self.nr = nr
+        self.dorun = run
         self.file = file
         self.flash_output = None
         self.flash_error = None
         self.compile_output = None
         self.compile_error = None
-        self.compile()
-        if not self.compile_error:
-            self.run()
 
     def compile(self):
         try: os.unlink("abc.swf");
@@ -93,9 +132,13 @@ class Test:
         self.compile_error = 0
         self.compile_output = output
         if ret:
+            self.compile_output += "\nExit status %d" % (-ret)
             self.compile_error = 1
+            return 0
         if not os.path.isfile("abc.swf"):
             self.compile_error = 1
+            return 0
+        return 1
 
     def run(self):
         ret,output = runcmd("flashplayer",["abc.swf"],wait=1)
@@ -104,52 +147,99 @@ class Test:
         
         if not check(self.flash_output):
             self.flash_error = 1
+            return 0
+        return 1
 
     def doprint(self):
-        def r(s,l):
-            if(len(s)>=l):
-                return s
-            return (" "*(l-len(s))) + s
-        def l(s,l):
-            if(len(s)>=l):
-                return s
-            return s + (" "*(l-len(s)))
-
-        print r(str(self.nr),3)," ",
+        print self.r(str(self.nr),3)," ",
         if self.compile_error:
-            print "err"," - ",
+            if self.dorun:
+                print "err"," - ",
+            else:
+                print "err","   ",
         else:
             print "ok ",
-            if not self.flash_error:
-                print "ok ",
+            if self.dorun:
+                if not self.flash_error:
+                    print "ok ",
+                else:
+                    print "err",
             else:
-                print "err",
+                print "   ",
         print " ",
-        print file
+        print self.file
 
     def doprintlong(self):
         print self.nr, self.file
         print "================================"
-        print test.compile_output
+        print "compile:", (self.compile_error and "error" or "ok")
+        print self.compile_output
+        if not self.dorun:
+            return
         print "================================"
-        print test.flash_output
+        print "run:", (self.flash_error and "error" or "ok")
+        print self.flash_output
         print "================================"
 
-checknum=-1
-if len(sys.argv)>1:
-    checknum = int(sys.argv[1])
+    def r(self,s,l):
+        if(len(s)>=l):
+            return s
+        return (" "*(l-len(s))) + s
+    def l(self,s,l):
+        if(len(s)>=l):
+            return s
+        return s + (" "*(l-len(s)))
 
-for nr,file in sorted(enumerate(os.listdir("ok"))):
-    if not file.endswith(".as"):
-        continue
-    file = os.path.join("ok", file)
-    if checknum>=0 and nr!=checknum:
-        continue
-    test = Test(nr,file)
+class Test(TestBase):
+    def __init__(self, cache, nr, file):
+        TestBase.__init__(self, nr, file, run=1)
+        if self.compile() and self.run():
+            cache.file_status(file, "ok")
+        else:
+            cache.file_status(file, "error")
 
-    if checknum!=nr:
-        test.doprint()
-    else:
-        test.doprintlong()
+class ErrTest(TestBase):
+    def __init__(self, cache, nr, file):
+        TestBase.__init__(self, nr, file, run=0)
+        if self.compile():
+            cache.file_status(file, "error")
+            self.compile_error = True
+        else:
+            cache.file_status(file, "ok")
+            self.compile_error = False
+
+class Suite:
+    def __init__(self, cache, dir):
+        self.dir = dir
+        self.cache = cache
+        self.errtest = "err" in dir
+    def run(self, nr):
+        print "-"*40,"tests \""+self.dir+"\"","-"*40
+        for file in sorted(os.listdir(self.dir)):
+            if not file.endswith(".as"):
+                continue
+            nr = nr + 1
+            file = os.path.join(self.dir, file)
+
+            if cache.skip_file(nr, file):
+                continue
+
+            if self.errtest:
+                test = ErrTest(cache, nr, file)
+            else:
+                test = Test(cache, nr, file)
+
+            if not cache.highlight(nr, file):
+                test.doprint()
+            else:
+                test.doprintlong()
+        return nr
+
+cache = Cache.load(".tests.cache")
+cache.parse_args()
 
+nr = 0
+nr = Suite(cache, "err").run(nr)
+nr = Suite(cache, "ok").run(nr)
 
+cache.save(".tests.cache")