[Gzz-commits] fenfire/org/fenfire test/gfx.py test/test.py ut...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Tuomas J. Lukka <address@hidden>        03/03/26 13:15:11

Modified files:
        org/fenfire/test: gfx.py test.py 
Added files:
        org/fenfire/util: GLSpanner.java PageSpanPaper.java 
                          pagespanpaper.py pagespanpaper.test 
        org/fenfire/view: PageSpanLayout.java 

Log message:
        Working towards xupdf demo... pagespanpaper &c

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/test/gfx.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/test/test.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/GLSpanner.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/PageSpanPaper.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/pagespanpaper.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/pagespanpaper.test?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/PageSpanLayout.java?rev=1.1

Patches:
Index: fenfire/org/fenfire/test/gfx.py
diff -u fenfire/org/fenfire/test/gfx.py:1.3 fenfire/org/fenfire/test/gfx.py:1.4
--- fenfire/org/fenfire/test/gfx.py:1.3 Sun Mar 16 11:24:12 2003
+++ fenfire/org/fenfire/test/gfx.py     Wed Mar 26 13:15:10 2003
@@ -29,6 +29,13 @@
 
 import org
 
+class GLNeeded:
+    pass
+
+def needGL():
+    if org.nongnu.libvob.GraphicsAPI.getInstance().getTypeString() != "gl":
+       raise GLNeeded()
+
 print "Init test.gfx"
 
 _didRender = 0
Index: fenfire/org/fenfire/test/test.py
diff -u fenfire/org/fenfire/test/test.py:1.5 
fenfire/org/fenfire/test/test.py:1.6
--- fenfire/org/fenfire/test/test.py:1.5        Sun Mar 16 11:24:12 2003
+++ fenfire/org/fenfire/test/test.py    Wed Mar 26 13:15:10 2003
@@ -163,9 +163,13 @@
             exceptions = []
 
             for file in tests(self.dirs):
-                exceptions.extend(test(load(file)))
+               try:
+                   loaded = load(file)
+                   exceptions.extend(test(loaded))
 
-                print
+                   print
+               except org.fenfire.test.gfx.GLNeeded, e:
+                   print "Skipping, needs GL."
 
             for exc in exceptions:
                 print 75 * '-'