[Gzz-commits] gzz ./Makefile test/testutil.py test/gzz/gfx/lo...

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      02/10/09 04:18:36

Modified files:
        .              : Makefile 
        test           : testutil.py 
        test/gzz/gfx   : locale.test 
        test/gzz/gfx/jni: jnistrconv.test 

Log message:
        Misfix Asko's jni test fix, simplify makefile target naming

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Makefile.diff?tr1=1.184&tr2=1.185&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/testutil.py.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/gfx/locale.test.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/gfx/jni/jnistrconv.test.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: gzz/Makefile
diff -c gzz/Makefile:1.184 gzz/Makefile:1.185
*** gzz/Makefile:1.184  Wed Oct  9 02:50:26 2002
--- gzz/Makefile        Wed Oct  9 04:18:36 2002
***************
*** 1,10 ****
  # This Makefile requires GNU make.
  
  # all must compile everywhere
! all: compile rmi batchtest
! alltests: batchtest batchtest-junit slow test-
  botcompile: compile rmi
! bottest: batchtest batchtest-junit slow
  
  CVS=cvs
  
--- 1,10 ----
  # This Makefile requires GNU make.
  
  # all must compile everywhere
! all: compile rmi test
! alltests: test batchtest-junit slow test-
  botcompile: compile rmi
! bottest: test batchtest-junit slow
  
  CVS=cvs
  
***************
*** 15,21 ****
  dist: 
        rm -Rf $(DISTDIR)
        mkdir $(DISTDIR)
!       $(NOTEST) || $(MAKE) batchtest slow     
        $(MAKE) clean 
        $(MAKE) ready_to_compile doc
        find . ! -type d|egrep -v 
'^\./(basalt|lava|C\+\+|Perl|Java|Modules)|/CVS/|#|~|\$$py\.class$$|\./gzz.*(jar|tar.gz)$$'
 | \
--- 15,21 ----
  dist: 
        rm -Rf $(DISTDIR)
        mkdir $(DISTDIR)
!       $(NOTEST) || $(MAKE) test slow  
        $(MAKE) clean 
        $(MAKE) ready_to_compile doc
        find . ! -type d|egrep -v 
'^\./(basalt|lava|C\+\+|Perl|Java|Modules)|/CVS/|#|~|\$$py\.class$$|\./gzz.*(jar|tar.gz)$$'
 | \
***************
*** 36,42 ****
        rm -Rf $(jardir)
        mkdir $(jardir)
        $(MAKE) compile
!       $(NOTEST) || $(MAKE) batchtest slow
        echo 'Main-Class: $(mainclass)' > $(jardir)/manifest
        (cd $(jardir) && for jar in pythonlib yaml jythonlib jython; do \
            jar xvf ../$(GZZ_DEPENDS)/$$jar.jar ;\
--- 36,42 ----
        rm -Rf $(jardir)
        mkdir $(jardir)
        $(MAKE) compile
!       $(NOTEST) || $(MAKE) test slow
        echo 'Main-Class: $(mainclass)' > $(jardir)/manifest
        (cd $(jardir) && for jar in pythonlib yaml jythonlib jython; do \
            jar xvf ../$(GZZ_DEPENDS)/$$jar.jar ;\
***************
*** 353,359 ****
  
  
  # Please note that JUnit tests are deprecated and should be converted into
! # tests written in python. See targets "test" and "batchtest".
  TESTCLASS=gzz.Test
  TESTRUNNER=junit.awtui.TestRunner
  TESTCOMMAND=$(JAVA) -Dzdir=$(Z_DIR) $(TESTRUNNER)
--- 353,359 ----
  
  
  # Please note that JUnit tests are deprecated and should be converted into
! # tests written in python. See targets "test" and "test".
  TESTCLASS=gzz.Test
  TESTRUNNER=junit.awtui.TestRunner
  TESTCOMMAND=$(JAVA) -Dzdir=$(Z_DIR) $(TESTRUNNER)
***************
*** 380,393 ****
        $(GLLIB) $(JYTHON) $(DBG)
  
  
- test: batchtest # For now
- 
  ifeq (,$(Z))
    Z=-t
  endif
  
! batchtest:
        $(GLLIB) $(JYTHON) test/test.py
  runtest:  # Use: make runtest TEST=gzz/vob/vobmatcher, to run a single test.
        $(GLLIB) $(JYTHON) test/testutil.py $(DBG) test/$(TEST).test
  runtestjni: # In JNI-dependent test's requestJNI must be defined.
--- 380,393 ----
        $(GLLIB) $(JYTHON) $(DBG)
  
  
  ifeq (,$(Z))
    Z=-t
  endif
  
! test:
        $(GLLIB) $(JYTHON) test/test.py
+ testgl:
+       $(GLLIB) $(JYTHON) test/test.py jni
  runtest:  # Use: make runtest TEST=gzz/vob/vobmatcher, to run a single test.
        $(GLLIB) $(JYTHON) test/testutil.py $(DBG) test/$(TEST).test
  runtestjni: # In JNI-dependent test's requestJNI must be defined.
***************
*** 447,460 ****
  runpplocal: 
        $(GLLIB) $(JYTHON) gzz/modules/pp/localpp.py $(DBG) 
  
! gzzgl:
        make -C gfx all
  
  
  DATE:=$(shell date '+%Y%m%d%H%M%S')
  PPDIR:=pp-$(DATE)
  
! packagepp: compile gzzgl
        rm -rf $(PPDIR)
        mkdir $(PPDIR)
        cp -a CLASSES/* $(PPDIR)
--- 447,462 ----
  runpplocal: 
        $(GLLIB) $(JYTHON) gzz/modules/pp/localpp.py $(DBG) 
  
! gl: compilegl testgl
! 
! compilegl: compile
        make -C gfx all
  
  
  DATE:=$(shell date '+%Y%m%d%H%M%S')
  PPDIR:=pp-$(DATE)
  
! packagepp: gl
        rm -rf $(PPDIR)
        mkdir $(PPDIR)
        cp -a CLASSES/* $(PPDIR)
Index: gzz/test/gzz/gfx/jni/jnistrconv.test
diff -c gzz/test/gzz/gfx/jni/jnistrconv.test:1.4 
gzz/test/gzz/gfx/jni/jnistrconv.test:1.5
*** gzz/test/gzz/gfx/jni/jnistrconv.test:1.4    Wed Oct  9 02:50:26 2002
--- gzz/test/gzz/gfx/jni/jnistrconv.test        Wed Oct  9 04:18:36 2002
***************
*** 1,9 ****
  from gzz.gfx.gl import GL_Testing
  import java.lang.String
  
- def requiresJNI():
-     pass
- 
  def testUniAZ():
      str = "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
      failIf(str != GL_Testing.loopUnistrConv(str), 
--- 1,6 ----
Index: gzz/test/gzz/gfx/locale.test
diff -c gzz/test/gzz/gfx/locale.test:1.1 gzz/test/gzz/gfx/locale.test:1.2
*** gzz/test/gzz/gfx/locale.test:1.1    Wed Oct  9 02:50:26 2002
--- gzz/test/gzz/gfx/locale.test        Wed Oct  9 04:18:36 2002
***************
*** 1,8 ****
  from gzz.gfx.gl import GL_Testing
  
- def requiresJNI():
-     pass
- 
  def testAtof():
      failIf(GL_Testing.useAtof("0.9") == 0.0,
        "Locale error: String to double conversion atof() \
--- 1,5 ----
Index: gzz/test/testutil.py
diff -c gzz/test/testutil.py:1.14 gzz/test/testutil.py:1.15
*** gzz/test/testutil.py:1.14   Wed Oct  9 02:50:26 2002
--- gzz/test/testutil.py        Wed Oct  9 04:18:36 2002
***************
*** 32,37 ****
--- 32,38 ----
  """
  
  import unittest, os.path, fnmatch, string, imp
+ import java
  
  true = 1
  false = 0
***************
*** 73,87 ****
  
      compiledTestFile = compile(open(file).read() + '\n', file, 'exec')
      tests = {}
!     exec compiledTestFile in globals(), tests
! 
      try:
!         if tests.keys().index('requiresJNI') >= 0:
!             if enableJNI == false:
!                 print file + " skipped: JNI required."
!                 return
!     except ValueError:
!         pass
      
      testnames = [t for t in tests.keys() if t.startswith('test')]
  
--- 74,92 ----
  
      compiledTestFile = compile(open(file).read() + '\n', file, 'exec')
      tests = {}
!     
!     def jni(e, file=file):
!         # A jni test
!         if enableJNI == false:
!             print file + " skipped: JNI required."
!             return
!         else:
!             raise e
!     
      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')]