#12 All EJDB tests passed! Need a few days to prepare release and test on win64

diff --git a/tcejdb/configure.ac b/tcejdb/configure.ac
index ceddf10..b4e4154 100644 (file)
--- a/tcejdb/configure.ac
+++ b/tcejdb/configure.ac
@@ -393,7 +393,7 @@ AC_SUBST(PACKAGE_NAME)
 AC_SUBST(PACKAGE_VERSION)
 
 # Targets
-AC_OUTPUT(Makefile tcejdb.pc)
+AC_OUTPUT(Makefile tcejdb.pc testejdb/Makefile)
 
 # Messages
 printf '#================================================================\n'

diff --git a/tcejdb/ejdb_private.h b/tcejdb/ejdb_private.h
index 4c9bd40..76136cc 100644 (file)
--- a/tcejdb/ejdb_private.h
+++ b/tcejdb/ejdb_private.h
@@ -25,6 +25,12 @@
 #include <assert.h>
 #include <pthread.h>
 
+#ifdef _WIN32
+#include <pcreposix.h>
+#else
+#include <regex.h>
+#endif
+
 EJDB_EXTERN_C_START
 
 #define BSON_IS_IDXSUPPORTED_TYPE(atype) (atype == BSON_STRING || \

diff --git a/tcejdb/tchdb.c b/tcejdb/tchdb.c
index 6bc34db..648f9a0 100644 (file)
--- a/tcejdb/tchdb.c
+++ b/tcejdb/tchdb.c
@@ -347,7 +347,7 @@ bool tchdbsetcache(TCHDB *hdb, int32_t rcnum) {
 /* Set the size of the extra mapped memory of a hash database object. */
 bool tchdbsetxmsiz(TCHDB *hdb, int64_t xmsiz) {
 #if defined (_WIN32) && defined(_DEBUG)
-    fprintf(stderr, "\ntchdbsetxmsiz does not takes effect on windows platform\n");
+    //fprintf(stderr, "\ntchdbsetxmsiz does not takes effect on windows platform\n");
     return true;
 #else
     assert(hdb);

diff --git a/tcejdb/testejdb/Makefile b/tcejdb/testejdb/Makefile.in
similarity index 64%
rename from tcejdb/testejdb/Makefile
rename to tcejdb/testejdb/Makefile.in
index c006fc7..7ed5e67 100644 (file)
--- a/tcejdb/testejdb/Makefile
+++ b/tcejdb/testejdb/Makefile.in
@@ -1,10 +1,10 @@
 
-CC=gcc
-CPPFLAGS = -I. -I.. -DDEBUG -D_DEBUG -D_GNU_SOURCE=1 -D_REENTRANT -D__EXTENSIONS__
-CFLAGS = -std=c99 -Wall -fPIC -pedantic -fsigned-char -g -O0
-LDFLAGS = -L. -L..
+CC=@CC@
+CPPFLAGS = -I../ @MYCPPFLAGS@
+CFLAGS = @MYCFLAGS@
+LDFLAGS = -L../ @MYLDFLAGS@
 CMDLDFLAGS =
-LIBS = -lz -lpthread -lm -lc -lcunit
+LIBS = -lcunit -ltcejdb @LIBS@
 RUNENV = LD_LIBRARY_PATH=.:.. DYLD_LIBRARY_PATH=.:..
 
 TESTS = t1 t2 t3 t4
@@ -42,16 +42,16 @@ clean :
        rm -rf *.o $(TESTS) db* *.vlog
 
 t1 : t1.o
-       $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) -ltcejdb $(CMDLDFLAGS) $(LIBS)
+       $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CMDLDFLAGS) $(LIBS)
 
 t2 : t2.o
-       $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) -ltcejdb $(CMDLDFLAGS) $(LIBS)
+       $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CMDLDFLAGS) $(LIBS)
 
 t3 : t3.o
-       $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) -ltcejdb $(CMDLDFLAGS) $(LIBS)
+       $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CMDLDFLAGS) $(LIBS)
 
 t4 : t4.o
-       $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) -ltcejdb $(CMDLDFLAGS) $(LIBS)
+       $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CMDLDFLAGS) $(LIBS)
 
 
 .PHONY : all clean check check-t1 check-t2 check-t3 check-t4

diff --git a/tcejdb/testejdb/t1.c b/tcejdb/testejdb/t1.c
index 72d215a..3915ec3 100644 (file)
--- a/tcejdb/testejdb/t1.c
+++ b/tcejdb/testejdb/t1.c
@@ -5,11 +5,10 @@
  * Created on Sep 18, 2012, 10:42:19 PM
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include "CUnit/Basic.h"
-#include <assert.h>
+#include "myconf.h"
 #include "ejdb_private.h"
+#include "CUnit/Basic.h"
+
 
 /*
  * CUnit Test Suite

diff --git a/tcejdb/testejdb/t2.c b/tcejdb/testejdb/t2.c
index e903c13..3fc0ed8 100644 (file)
--- a/tcejdb/testejdb/t2.c
+++ b/tcejdb/testejdb/t2.c
@@ -5,15 +5,9 @@
  * Created on Oct 1, 2012, 3:13:44 PM
  */
 
-#include "bson.h"
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "CUnit/Basic.h"
-#include <assert.h>
+#include "myconf.h"
 #include "ejdb_private.h"
-#include <locale.h>
+#include "CUnit/Basic.h"
 
 /*
  * CUnit Test Suite

diff --git a/tcejdb/testejdb/t3.c b/tcejdb/testejdb/t3.c
index 4300b77..e44e7d1 100644 (file)
--- a/tcejdb/testejdb/t3.c
+++ b/tcejdb/testejdb/t3.c
@@ -5,15 +5,10 @@
  * Created on Oct 26, 2012, 12:12:45 PM
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <assert.h>
+#include "myconf.h"
 #include "ejdb_private.h"
-#include <locale.h>
-#include <pthread.h>
-
 #include "CUnit/Basic.h"
+#include <stdlib.h>
 
 /*
  * CUnit Test Suite
@@ -32,7 +27,7 @@ int init_suite(void) {
     if (!ejdbopen(jb, "dbt3", JBOWRITER | JBOCREAT | JBOTRUNC)) {
         return 1;
     }
-    srandom(tcmstime());
+    srand(tcmstime());
     recs = malloc(RS * sizeof (bson));
     if (!recs) {
         return 1;
@@ -44,11 +39,11 @@ int init_suite(void) {
         char str[128];
         int len = 0;
         do {
-            len = random() % 128;
+            len = rand() % 128;
         } while (len <= 0);
         str[0] = 'A' + (i % 26);
         for (int j = 1; j < len; ++j) {
-            str[j] = 'a' + random() % 26;
+            str[j] = 'a' + rand() % 26;
         }
         str[len] = '\0';
         bson_append_string(&bs, "rstring", str);
@@ -86,7 +81,7 @@ void testPerf1() {
     uint32_t acount = 0;
     int i;
     for (i = 0; i < QRS; ++i) {
-        int idx = random() % QRS;
+        int idx = rand() % QRS;
         bson *bs = recs + idx;
         assert(bs);
         EJQ *q = ejdbcreatequery(jb, bs, NULL, 0, NULL);
@@ -111,7 +106,7 @@ void testPerf1() {
     st = tcmstime();
     acount = 0;
     for (i = 0; i < QRS; ++i) {
-        int idx = random() % QRS;
+        int idx = rand() % QRS;
         bson *bs = recs + idx;
         assert(bs);
         EJQ *q = ejdbcreatequery(jb, bs, NULL, 0, NULL);

diff --git a/tcejdb/testejdb/t4.c b/tcejdb/testejdb/t4.c
index 793ca62..740e7fd 100644 (file)
--- a/tcejdb/testejdb/t4.c
+++ b/tcejdb/testejdb/t4.c
@@ -1,10 +1,7 @@
 
-#include <locale.h>
-#include <pthread.h>
+#include "myconf.h"
 #include "ejdb_private.h"
-
 #include "CUnit/Basic.h"
-
 /*
  * CUnit Test Suite
  */
@@ -28,7 +25,7 @@ void testTicket53() {
     if (!coll) {
         eprint(jb, __LINE__, "testTicket53");
     }
-    CU_ASSERT_TRUE(coll);
+    CU_ASSERT_TRUE(coll != NULL);
     ejdbclose(jb);
     ejdbdel(jb);
 }