[pypy-svn] r43972 - in pypy/dist/pypy/translator/jvm: src/pypy test

[niko at codespeak.net]

Author: niko
Date: Fri Jun  1 12:20:39 2007
New Revision: 43972

Modified:
   pypy/dist/pypy/translator/jvm/src/pypy/PyPy.java
   pypy/dist/pypy/translator/jvm/test/test_primitive.py
Log:
quickly implement ll_time_time



Modified: pypy/dist/pypy/translator/jvm/src/pypy/PyPy.java
==============================================================================
--- pypy/dist/pypy/translator/jvm/src/pypy/PyPy.java	(original)
+++ pypy/dist/pypy/translator/jvm/src/pypy/PyPy.java	Fri Jun  1 12:20:39 2007
@@ -485,6 +485,10 @@
     // Primitive built-in functions
 
     public static double ll_time_clock() {
+        return System.currentTimeMillis()/1000; // XXX: processor time?
+    }
+
+    public static double ll_time_time() {
         return System.currentTimeMillis()/1000;
     }
 

Modified: pypy/dist/pypy/translator/jvm/test/test_primitive.py
==============================================================================
--- pypy/dist/pypy/translator/jvm/test/test_primitive.py	(original)
+++ pypy/dist/pypy/translator/jvm/test/test_primitive.py	Fri Jun  1 12:20:39 2007
@@ -7,9 +7,8 @@
 class TestPrimitive(JvmTest):
 
     def test_time_time(self):
-        py.test.skip("ll_time_time is not implemented in jvm backend")
-#        def fn():
-#            return time.time()
-#        t1 = self.interpret(fn, [])
-#        t2 = self.interpret(fn, [])
-#        assert t1 <= t2
+        def fn():
+            return time.time()
+        t1 = self.interpret(fn, [])
+        t2 = self.interpret(fn, [])
+        assert t1 <= t2