Changeset 3542 for XerialJ/trunk/sqlite-jdbc

Timestamp:

08/18/09 13:15:00 (3 years ago)

Author:

leo

Message:

added pure-java mode test

Location:

XerialJ/trunk/sqlite-jdbc

Files:

• Makefile.package (modified) (1 diff)
• src/main/java/org/sqlite/NestedDB.java (modified) (2 diffs)
• src/test/java/org/sqlite/TransactionTest.java (modified) (2 diffs)

XerialJ/trunk/sqlite-jdbc/Makefile.package

@@ -70 +70 @@
         ssh $(LINUX_SERVER) "source .zprofile && source /etc/profile.d/java.sh && cd $(LINUX_WORK) && $(TEST_CMD)"
         ssh $(AMD_SERVER) "source .zprofile && cd $(AMD_WORK) && $(TEST_CMD)"
+        ssh $(WIN_SERVER) "source .zprofile && cd $(WIN_WORK) && $(TEST_CMD) -DargLine='-Dsqlite.purejava=true'"
 
         

XerialJ/trunk/sqlite-jdbc/src/main/java/org/sqlite/NestedDB.java

@@ -161 +161 @@
 
     @Override
-    protected int _exec(String sql) throws SQLException
-    {
-        int passback = rt.malloc(4);
+    protected synchronized int _exec(String sql) throws SQLException
+    {
+        int passback = rt.xmalloc(4);
         int str = rt.strdup(sql);
         int status = call("sqlite3_exec", handle, str, 0, 0, passback);
@@ -169 +169 @@
         {
             String errorMessage = cstring(passback);
-            call("sqlite3_free", passback);
+            call("sqlite3_free", deref(passback));
             rt.free(passback);
             throwex(status, errorMessage);

XerialJ/trunk/sqlite-jdbc/src/test/java/org/sqlite/TransactionTest.java

@@ -1 +1 @@
 package org.sqlite;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 import java.io.File;
@@ -37 +35 @@
     {
         Class.forName("org.sqlite.JDBC");
+        System.out.println("running in " + (SQLiteJDBCLoader.isNativeMode() ? "native" : "pure-java") + " mode");
     }