[Gzz-commits] gzz/test testutil.py gzz/gfx/locale.test gzz/gf...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/10/12 06:18:09

Modified files:
        test           : testutil.py 
        test/gzz/gfx   : locale.test 
        test/gzz/gfx/gl: checkColor.py glvobcoorder.test 
        test/gzz/gfx/jni: jnistrconv.test 

Log message:
        Move to a different direction in selecting tests: need to select test 
BEFORE, not AFTER; skipping a test because it happened to fail is not really a 
good idea ;)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/testutil.py.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/gfx/locale.test.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/gfx/gl/checkColor.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/gfx/gl/glvobcoorder.test.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/gfx/jni/jnistrconv.test.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: gzz/test/gzz/gfx/gl/checkColor.py
diff -c gzz/test/gzz/gfx/gl/checkColor.py:1.2 
gzz/test/gzz/gfx/gl/checkColor.py:1.3
*** gzz/test/gzz/gfx/gl/checkColor.py:1.2       Sat Oct 12 06:05:41 2002
--- gzz/test/gzz/gfx/gl/checkColor.py   Sat Oct 12 06:18:09 2002
***************
*** 1,4 ****
! needGL = 1
  
  win = getGraphicsWindow()
  
--- 1,4 ----
! needGL()
  
  win = getGraphicsWindow()
  
Index: gzz/test/gzz/gfx/gl/glvobcoorder.test
diff -c gzz/test/gzz/gfx/gl/glvobcoorder.test:1.8 
gzz/test/gzz/gfx/gl/glvobcoorder.test:1.9
*** gzz/test/gzz/gfx/gl/glvobcoorder.test:1.8   Mon Oct  7 04:51:24 2002
--- gzz/test/gzz/gfx/gl/glvobcoorder.test       Sat Oct 12 06:18:09 2002
***************
*** 1,9 ****
! 
  
  from gzz.gfx.gl import GLVobCoorder, GL
  from jarray import array, zeros
- 
- GL.loadLib()
  
  def checkTrans(c, cs, srclist, dstlist, delta=0):
      src = array(srclist, 'f')
--- 1,7 ----
! needGL()
  
  from gzz.gfx.gl import GLVobCoorder, GL
  from jarray import array, zeros
  
  def checkTrans(c, cs, srclist, dstlist, delta=0):
      src = array(srclist, 'f')
Index: gzz/test/gzz/gfx/jni/jnistrconv.test
diff -c gzz/test/gzz/gfx/jni/jnistrconv.test:1.5 
gzz/test/gzz/gfx/jni/jnistrconv.test:1.6
*** gzz/test/gzz/gfx/jni/jnistrconv.test:1.5    Wed Oct  9 04:18:36 2002
--- gzz/test/gzz/gfx/jni/jnistrconv.test        Sat Oct 12 06:18:09 2002
***************
*** 1,3 ****
--- 1,5 ----
+ needGL()
+ 
  from gzz.gfx.gl import GL_Testing
  import java.lang.String
  
Index: gzz/test/gzz/gfx/locale.test
diff -c gzz/test/gzz/gfx/locale.test:1.2 gzz/test/gzz/gfx/locale.test:1.3
*** gzz/test/gzz/gfx/locale.test:1.2    Wed Oct  9 04:18:36 2002
--- gzz/test/gzz/gfx/locale.test        Sat Oct 12 06:18:09 2002
***************
*** 1,3 ****
--- 1,5 ----
+ needGL()
+ 
  from gzz.gfx.gl import GL_Testing
  
  def testAtof():
Index: gzz/test/testutil.py
diff -c gzz/test/testutil.py:1.20 gzz/test/testutil.py:1.21
*** gzz/test/testutil.py:1.20   Sat Oct 12 02:36:51 2002
--- gzz/test/testutil.py        Sat Oct 12 06:18:08 2002
***************
*** 48,53 ****
--- 48,60 ----
  false = 0
  enableJNI = false
  
+ class NeedGLError:
+     pass
+ 
+ def needGL():
+     if enableJNI: return
+     raise NeedGLError()
+ 
  def tests(files):
      """
      Return a list of all *.test files in a given directory and its
***************
*** 99,106 ****
      
      try:
          exec compiledTestFile in globals(), tests
!     except java.lang.UnsatisfiedLinkError, e: jni(e)
!     except java.lang.NoClassDefFoundError, e: jni(e)
      
      testnames = [t for t in tests.keys() if t.startswith('test')]
  
--- 106,113 ----
      
      try:
          exec compiledTestFile in globals(), tests
!     except NeedGLError, e:
!       print "Skipping test %s because it needs OpenGL compiled.", file
      
      testnames = [t for t in tests.keys() if t.startswith('test')]
  
***************
*** 182,187 ****
--- 189,195 ----
      class Starter(java.lang.Runnable):
        def run(self):
            unittest.TextTestRunner(verbosity=2).run(suite(test))
+           java.lang.System.exit(0)
      GraphicsAPI.getInstance().startUpdateManager(Starter())