[ff-cvs] libvob ./Makefile bench/mark.py test/vob/util/m...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/08/16 05:04:54

Modified files:
        .              : Makefile 
        bench          : mark.py 
        test/vob/util  : maps.test 

Log message:
        Fix map package. The test should be moved at some point

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/Makefile.diff?tr1=1.44&tr2=1.45&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/bench/mark.py.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/test/vob/util/maps.test.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: libvob/Makefile
diff -u libvob/Makefile:1.44 libvob/Makefile:1.45
--- libvob/Makefile:1.44        Wed Aug 13 09:39:07 2003
+++ libvob/Makefile     Sat Aug 16 05:04:54 2003
@@ -37,7 +37,7 @@
 
 VOB_DEPENDS = ../libvob-depends
 
-CLASSPATH 
=$(CLASSDIR):$(VOB_DEPENDS)/jython.jar:$(VOB_DEPENDS)/collections-kaffe.jar:$(shell
 echo $$CLASSPATH)
+CLASSPATH 
=$(CLASSDIR):../navidoc/CLASSES:$(VOB_DEPENDS)/jython.jar:$(VOB_DEPENDS)/collections-kaffe.jar:$(shell
 echo $$CLASSPATH)
 export CLASSPATH
 
 ifeq (,$(JYTHONPATH))
@@ -97,7 +97,7 @@
        $(GLLIB) $(JYTHON) test.py -Dvob.api=gl -f \* $(DBG) jni $(TEST)
 
 bench-gl::
-       $(GLLIB) $(JYTHON) bench/mark.py -Dvob.api=gl $(DBG) $(BENCH)
+       $(GLLIB) $(JYTHON) runbench.py -Dvob.api=gl $(DBG) $(BENCH)
 
 rundemo::
        $(GLLIB) $(JYTHON) rundemo.py $(DBG) $(DEMO)
Index: libvob/bench/mark.py
diff -u libvob/bench/mark.py:1.10 libvob/bench/mark.py:1.11
--- libvob/bench/mark.py:1.10   Thu Jun 26 04:51:29 2003
+++ libvob/bench/mark.py        Sat Aug 16 05:04:54 2003
@@ -25,7 +25,6 @@
 
 
 import sys
-import vob
 vob = sys.modules["vob"]
 
 import sys, types, traceback
@@ -111,9 +110,6 @@
            
 
 import getopt
-print dir(vob)
-print dir(vob.putil)
-print dir(vob.util)
 opts, args = getopt.getopt(sys.argv[1:], 
        vob.putil.dbg.short, 
        vob.putil.dbg.long)
Index: libvob/test/vob/util/maps.test
diff -u libvob/test/vob/util/maps.test:1.3 libvob/test/vob/util/maps.test:1.4
--- libvob/test/vob/util/maps.test:1.3  Sun Jun 22 08:08:39 2003
+++ libvob/test/vob/util/maps.test      Sat Aug 16 05:04:54 2003
@@ -23,6 +23,7 @@
 from __future__ import nested_scopes
 
 import java, vob
+from org.nongnu import navidoc
 
 dbg = 0
 
@@ -38,7 +39,7 @@
 
 def testWeakValueMap():
 
-    m = vob.util.WeakValueMap()
+    m = navidoc.util.WeakValueMap()
 
     cs = createCS(0)