Addresses #1531 More porting for windows

git-svn-id: file:///svn/toku/tokudb@10477 c7de825b-a66e-492c-adef-691d508d4ae1

src/tests/Makefile

@@ -43,9 +43,11 @@ WINDOWS_DONTRUN_TESTS = \
 WINDOWS_BDB_DONTRUN_TESTS = \
 	diskfull \
 	test_groupcommit_count \
+	test_set_func_malloc \
 #\ ends prev line
 #diskfull: windows bdb is missing db_env_set_func_pwrite and db_env_set_func_write
 #test_groupcommit_count: windows bdb is missing db_env_set_func_fsync
+#test_set_func_malloc: windows bdb (some) are missing db_env_set_func_(malloc|realloc|free)
 
 ifeq ($(OS_CHOICE),windows)
     TDB_TESTS = $(patsubst %.c,%.tdb$(BINSUF),$(filter-out $(patsubst %,%.c,$(WINDOWS_DONTRUN_TESTS)),$(SRCS)))
@@ -157,15 +159,16 @@ ifdef BDBDIR
 %.bdb$(BINSUF): RPATH_DIRS=$(BDBDIR)/lib
 endif
 ifeq ($(DEBUG),0)
-WINDOWS_BDB_LIB_NAME=libdb$(BDBVER).$(SOEXT)
+WINDOWS_BDB_LIB_NAME=libdb.$(SOEXT)
 $(WINDOWS_BDB_LIB_NAME):
-	cp $(BDBDIR)/bin/$(WINDOWS_BDB_LIB_NAME) $@
+	cp $(BDBDIR)/lib/libdb[0-9][0-9].$(SOEXT) ./
 else
-WINDOWS_BDB_LIB_NAME=libdb$(BDBVER)d.$(SOEXT)
+WINDOWS_BDB_LIB_NAME=libdbd.$(SOEXT)
 $(WINDOWS_BDB_LIB_NAME):
-	cp $(BDBDIR)/bin/debug/$(WINDOWS_BDB_LIB_NAME) $@
+	cp $(BDBDIR)/lib/libdb[0-9][0-9]d.$(SOEXT) ./
 endif
 %.bdb$(BINSUF): DLINK_FILES=$(BDBDIR)/lib/$(WINDOWS_BDB_LIB_NAME)
+#empty
 else
 WINDOWS_BDB_LIB_NAME=
 #linux

src/tests/test.h

@@ -122,7 +122,7 @@ main(int argc, const char *argv[]) {
 #if IS_TDB && (defined(_WIN32) || defined(_WIN64))
     toku_ydb_init();
 #endif
-#if !IS_TDB
+#if !IS_TDB && DB_VERSION_MINOR==4 && DB_VERSION_MINOR == 7
     r = db_env_set_func_malloc(toku_malloc);   assert(r==0);
     r = db_env_set_func_free(toku_free);      assert(r==0);
     r = db_env_set_func_realloc(toku_realloc);   assert(r==0);

src/tests/test1572.c

@@ -5,8 +5,7 @@
 /* Is it feasible to run 4 billion transactions in one test in the regression tests? */
 #include <db.h>
 #include <sys/stat.h>
-
-extern void toku_set_lsn_increment (uint64_t incr);
+#include "log.h"
 
 static void
 four_billion_subtransactions (int do_something_in_children, int use_big_increment) {