Addresses #1338

src tests now call toku_ydb_init/destroy (if in windows)
Linux uses .so constructor/destructor methods

git-svn-id: file:///svn/toku/tokudb.1032b@8398 c7de825b-a66e-492c-adef-691d508d4ae1

src/tests/big-nested-abort-abort.c

@@ -105,7 +105,8 @@ test_shutdown (void) {
     r=env->close(env, 0); CKERR(r);
 }
 
-int main (int argc, const char *argv[]) {
+int
+test_main (int argc, const char *argv[]) {
     parse_args(argc, argv);
     setup();
     test_abort_abort();

src/tests/big-nested-abort-commit.c

@@ -105,7 +105,8 @@ test_shutdown (void) {
     r=env->close(env, 0); CKERR(r);
 }
 
-int main (int argc, const char *argv[]) {
+int
+test_main (int argc, const char *argv[]) {
     parse_args(argc, argv);
     setup();
     test_abort_commit();

src/tests/big-nested-commit-abort.c

@@ -101,7 +101,8 @@ test_shutdown (void) {
     r=env->close(env, 0); CKERR(r);
 }
 
-int main (int argc, const char *argv[]) {
+int
+test_main (int argc, const char *argv[]) {
     parse_args(argc, argv);
     setup();
     test_commit_abort();

src/tests/big-nested-commit-commit.c

@@ -101,7 +101,8 @@ test_shutdown (void) {
     r=env->close(env, 0); CKERR(r);
 }
 
-int main (int argc, const char *argv[]) {
+int
+test_main (int argc, const char *argv[]) {
     parse_args(argc, argv);
     setup();
     test_commit_commit();

src/tests/bug627.c

@@ -62,7 +62,8 @@ do_627 (void) {
     
 }
 
-int main (int argc, const char *argv[]) {
+int
+test_main (int argc, const char *argv[]) {
     parse_args(argc, argv);
     do_627();
     return 0;

src/tests/cursor-more-than-a-leaf-provdel.c

@@ -95,7 +95,8 @@ doit (BOOL committed_provdels) {
     r=txn->commit(txn, 0);    CKERR(r);
 }
 
-int main (int argc, const char *argv[]) {
+int
+test_main (int argc, const char *argv[]) {
     parse_args(argc, argv);
 
     setup();

src/tests/cursor-step-over-delete.c

@@ -59,7 +59,8 @@ doit (void) {
     r=txn->commit(txn, 0);    assert(r==0);
 }
 
-int main (int argc, const char *argv[]) {
+int
+test_main (int argc, const char *argv[]) {
     parse_args(argc, argv);
 
     test_setup();

src/tests/helgrind1.c

@@ -13,7 +13,8 @@ void *startb(void* ignore __attribute__((__unused__))) {
     return 0;
 }
 
-int main (int argc, const char *argv[]) {
+int
+test_main (int argc, const char *argv[]) {
     parse_args(argc, argv);
     pthread_t a,b;
     { int x_l = pthread_create(&a, NULL, starta, NULL); assert(x_l==0); }

src/tests/helgrind2.c

@@ -83,7 +83,8 @@ void *startb(void* ignore __attribute__((__unused__))) {
     return 0;
 }
 
-int main (int argc, const char *argv[]) {
+int
+test_main (int argc, const char *argv[]) {
     parse_args(argc, argv);
     pthread_t a,b;
     initialize();

src/tests/helgrind3.c

@@ -83,7 +83,8 @@ void *startb(void* ignore __attribute__((__unused__))) {
     return 0;
 }
 
-int main (int argc, const char *argv[]) {
+int
+test_main (int argc, const char *argv[]) {
     parse_args(argc, argv);
     pthread_t a,b;
     initialize();

src/tests/keyrange-dupsort-unflat.c

@@ -67,7 +67,8 @@ static void test (void) {
     r = env->close(env, 0);   assert(r==0);
 }
 
-int main (int argc , const char *argv[]) {
+int
+test_main (int argc , const char *argv[]) {
     parse_args(argc, argv);
     test();
     return 0;

src/tests/keyrange-dupsort.c

@@ -90,7 +90,8 @@ static void test (void) {
     r = env->close(env, 0);   assert(r==0);
 }
 
-int main (int argc , const char *argv[]) {
+int
+test_main (int argc , const char *argv[]) {
     parse_args(argc, argv);
     test();
     return 0;

src/tests/keyrange-unflat.c

@@ -76,7 +76,8 @@ static void test (void) {
     r = env->close(env, 0);   assert(r==0);
 }
 
-int main (int argc , const char *argv[]) {
+int
+test_main (int argc , const char *argv[]) {
     parse_args(argc, argv);
     test();
     return 0;

src/tests/keyrange.c

@@ -79,7 +79,8 @@ static void test (void) {
     r = env->close(env, 0);   assert(r==0);
 }
 
-int main (int argc , const char *argv[]) {
+int
+test_main (int argc , const char *argv[]) {
     parse_args(argc, argv);
     test();
     return 0;

src/tests/manyfiles.c

@@ -72,7 +72,8 @@ doit (void) {
     printf("%lld insertions in %9.6fs, %9.3f ins/s \n", ninserts, diff, ninserts/diff);
 }
 
-int main (int argc, const char *argv[]) {
+int
+test_main (int argc, const char *argv[]) {
     parse_args(argc, argv);
 
     test_setup();

src/tests/medium-nested-commit-commit.c

@@ -110,7 +110,8 @@ test_shutdown (void) {
     r=env->close(env, 0); CKERR(r);
 }
 
-int main (int argc, const char *argv[]) {
+int
+test_main (int argc, const char *argv[]) {
     parse_args(argc, argv);
     test_setup();
     test_commit_commit();

src/tests/test-recover1.c

@@ -49,7 +49,8 @@ static void test (void) {
     r=env->close(env, 0);                                                      CKERR(r);
 }
 
-int main (int argc __attribute__((__unused__)), char *argv[] __attribute__((__unused__))) {
+int
+test_main (int argc __attribute__((__unused__)), const char *argv[] __attribute__((__unused__))) {
     test();
     return 0;
 }

src/tests/test-recover2.c

@@ -66,7 +66,8 @@ static void test (void) {
     r=env->close(env, 0);                                                      CKERR(r);
 }
 
-int main (int argc __attribute__((__unused__)), char *argv[] __attribute__((__unused__))) {
+int
+test_main (int argc __attribute__((__unused__)), const char *argv[] __attribute__((__unused__))) {
     test();
     return 0;
 }

src/tests/test-recover3.c

@@ -79,7 +79,8 @@ static void test (void) {
     r=env->close(env, 0);                                                      CKERR(r);
 }
 
-int main (int argc __attribute__((__unused__)), char *argv[] __attribute__((__unused__))) {
+int
+test_main (int argc __attribute__((__unused__)), const char *argv[] __attribute__((__unused__))) {
     test();
     return 0;
 }

src/tests/test.h

@@ -6,7 +6,7 @@
 #include <db.h>
 #include <assert.h>
 #include <limits.h>
-
+#include "ydb.h"
 #ifndef DB_YESOVERWRITE
 #define DB_YESOVERWRITE 0
 #endif
@@ -101,3 +101,17 @@ typedef enum __toku_bool { FALSE=0, TRUE=1} BOOL;
 #define SET_TRACE_FILE(x) ((void)0)
 #define CLOSE_TRACE_FILE(x) ((void)0)
 #endif
+
+int test_main (int argc, const char *argv[]);
+int
+main(int argc, const char *argv[]) {
+#if defined(_WIN32) || defined(_WIN64)
+    toku_ydb_init();
+#endif
+    int r = test_main(argc, argv);
+#if defined(_WIN32) || defined(_WIN64)
+    toku_ydb_destroy();
+#endif
+    return r;
+}
+

src/tests/test938.c

@@ -117,7 +117,8 @@ run (int choice) {
 #endif
 }
 
-int main(int argc, const char *argv[]) {
+int
+test_main(int argc, const char *argv[]) {
     parse_args(argc, argv);
 
     system("rm -rf " ENVDIR);

src/tests/test938b.c

@@ -49,7 +49,8 @@ run (void) {
     }
 }
 
-int main(int argc, const char *argv[]) {
+int
+test_main(int argc, const char *argv[]) {
     parse_args(argc, argv);
 
     system("rm -rf " ENVDIR);

src/tests/test938c.c

@@ -50,7 +50,8 @@ run (void) {
     }
 }
 
-int main(int argc, const char *argv[]) {
+int
+test_main(int argc, const char *argv[]) {
     parse_args(argc, argv);
 
     system("rm -rf " ENVDIR);

src/tests/test944.c

@@ -107,7 +107,8 @@ run (int choice) {
 #endif
 }
 
-int main(int argc, const char *argv[]) {
+int
+test_main(int argc, const char *argv[]) {
     parse_args(argc, argv);
 
     system("rm -rf " ENVDIR);

src/tests/test944a.c

@@ -104,7 +104,8 @@ run (int choice) {
 #endif
 }
 
-int main(int argc, const char *argv[]) {
+int
+test_main(int argc, const char *argv[]) {
     parse_args(argc, argv);
 
     system("rm -rf " ENVDIR);

src/tests/test_789.c

@@ -135,7 +135,8 @@ test_789(void) {
     r = env->close(env, 0); assert(r == 0);
 }
 
-int main(int UU(argc), char UU(*argv[])) {
+int
+test_main(int UU(argc), const char UU(*argv[])) {
     test_789();
     return 0;
 }

src/tests/test_935.c

@@ -77,7 +77,8 @@ testit (const int klen, const int vlen, const int n, const int lastvlen) {
     r = env->close(env, 0); assert(r == 0);
 }
 
-int main(int argc, const char *argv[]) {
+int
+test_main(int argc, const char *argv[]) {
     parse_args(argc, argv);
     const int meg = 1024*1024;
     const int headeroverhead = 12*4;

src/tests/test_abort1.c

@@ -157,7 +157,8 @@ test_db_put_aborts (void) {
     r=env->close(env, 0);     assert(r==0);
 }
 
-int main (int UU(argc), char UU(*argv[])) {
+int
+test_main (int UU(argc), const char UU(*argv[])) {
     test_db_open_aborts();
     test_db_put_aborts();
     return 0;

src/tests/test_abort2.c

@@ -109,7 +109,8 @@ do_test_abort2 (void) {
 
 }
 
-int main (int argc, const char *argv[]) {
+int
+test_main (int argc, const char *argv[]) {
     parse_args(argc, argv);
     do_test_abort2();
     return 0;

src/tests/test_abort3.c

@@ -159,7 +159,8 @@ test_abort3 (void) {
     r=env->close(env, 0); CKERR(r);
 }
 
-int main (int argc, const char *argv[]) {
+int
+test_main (int argc, const char *argv[]) {
     parse_args(argc, argv);
     test_abort3();
     return 0;

src/tests/test_abort_delete_first.c

@@ -124,7 +124,8 @@ do_abort_delete_first_or_last(int N,
 #endif
 }
 
-int main (int argc, const char *argv[]) {
+int
+test_main (int argc, const char *argv[]) {
     parse_args(argc, argv);
     int f;
     for (f=0; f<2; f++) {

src/tests/test_archive0.c

@@ -6,7 +6,8 @@
 
 
 
-int main (int argc, const char *argv[]) {
+int
+test_main (int argc, const char *argv[]) {
     parse_args(argc, argv);
     DB_ENV *env;
     DB *db;

src/tests/test_archive1.c

@@ -4,7 +4,8 @@
 #include <sys/stat.h>
 #include "test.h"
 
-int main (int argc, const char *argv[]) {
+int
+test_main (int argc, const char *argv[]) {
     parse_args(argc, argv);
     DB_ENV *env;
     DB *db;

src/tests/test_archive2.c

@@ -4,7 +4,8 @@
 #include <sys/stat.h>
 #include "test.h"
 
-int main (int argc, const char *argv[]) {
+int
+test_main (int argc, const char *argv[]) {
     parse_args(argc, argv);
     DB_ENV *env;
     DB *db, *db2;

src/tests/test_cachesize.c

@@ -79,7 +79,8 @@ test_cachesize (void) {
 }
 
 
-int main(int argc, const char *argv[]) {
+int
+test_main(int argc, const char *argv[]) {
     parse_args(argc, argv);
     test_cachesize();
 

src/tests/test_cursor_2.c

@@ -78,7 +78,8 @@ test_cursor (void) {
     r = env->close(env, 0); assert(r == 0);
 }
 
-int main(int argc, const char *argv[]) {
+int
+test_main(int argc, const char *argv[]) {
 
     parse_args(argc, argv);
   

src/tests/test_cursor_3.c

@@ -90,7 +90,8 @@ test (void) {
     r = env->close(env, 0); assert(r == 0);
 }
 
-int main(int argc, const char *argv[]) {
+int
+test_main(int argc, const char *argv[]) {
 
     parse_args(argc, argv);
   

src/tests/test_cursor_DB_NEXT_no_dup.c

@@ -177,7 +177,8 @@ static void run_test(u_int32_t dup_flags) {
     /* ********************************************************************** */
 }
 
-int main(int argc, const char *argv[]) {
+int
+test_main(int argc, const char *argv[]) {
 
     parse_args(argc, argv);
   

src/tests/test_cursor_db_current.c

@@ -116,7 +116,8 @@ test_reopen (void) {
     r = db->close(db, 0); assert(r == 0);
 }
 
-int main(int argc, const char *argv[]) {
+int
+test_main(int argc, const char *argv[]) {
     parse_args(argc, argv);
   
     system("rm -rf " ENVDIR);

src/tests/test_cursor_delete.c

@@ -151,7 +151,8 @@ test_cursor_delete_dupsort (void) {
     r = db->close(db, 0); assert(r == 0);
 }
 
-int main(int argc, const char *argv[]) {
+int
+test_main(int argc, const char *argv[]) {
     int r;
 
     parse_args(argc, argv);

src/tests/test_cursor_delete2.c

@@ -60,7 +60,8 @@ test_cursor_delete2 (void) {
     r = dbenv->close(dbenv, 0);                                                              CKERR(r);
 }
 
-int main(int argc, const char *argv[]) {
+int
+test_main(int argc, const char *argv[]) {
 
     parse_args(argc, argv);
   

src/tests/test_cursor_delete2a.c

@@ -62,7 +62,8 @@ test_cursor_delete2 (void) {
     r = dbenv->close(dbenv, 0);                                                              CKERR(r);
 }
 
-int main(int argc, const char *argv[]) {
+int
+test_main(int argc, const char *argv[]) {
 
     parse_args(argc, argv);
   

src/tests/test_cursor_delete_next.c

@@ -68,7 +68,9 @@ cursor_range_with_delete (u_int32_t flag) {
     r = dbc->c_close(dbc);                          CKERR(r);
 }
 
-int main() {
+int
+test_main(int argc, const char *argv[]) {
+    parse_args(argc, argv);
     setup_db("next.db");
     insert();
     cursor_range_with_delete(DB_NEXT);

src/tests/test_cursor_flags.c

@@ -40,7 +40,8 @@ test_cursor_flags (int cursor_flags, int expectr) {
     r = db->close(db, 0); assert(r == 0);
 }
 
-int main(int argc, const char *argv[]) {
+int
+test_main(int argc, const char *argv[]) {
 
     parse_args(argc, argv);
   

src/tests/test_cursor_nonleaf_expand.c

@@ -88,7 +88,8 @@ test_cursor_nonleaf_expand (int n, int reverse) {
     r = db->close(db, 0); assert(r == 0);
 }
 
-int main(int argc, const char *argv[]) {
+int
+test_main(int argc, const char *argv[]) {
     parse_args(argc, argv);
 
     system("rm -rf " ENVDIR);

src/tests/test_cursor_null.c

@@ -171,7 +171,9 @@ test (u_int32_t dup_flags) {
     /* ********************************************************************** */
 }
 
-int main() {
+int
+test_main(int argc, const char *argv[]) {
+    parse_args(argc, argv);
     test(0);
     test(DB_DUP | DB_DUPSORT);
     return 0;

src/tests/test_cursor_stickyness.c

@@ -76,7 +76,8 @@ test_cursor_sticky (int n, int dup_mode) {
 }
 
 
-int main(int argc, const char *argv[]) {
+int
+test_main(int argc, const char *argv[]) {
     int r;
     int i;
 

src/tests/test_db_already_exists.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
 
+#include "test.h"
+
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <stdio.h>
@@ -12,9 +14,9 @@
 
 // ENVDIR is defined in the Makefile
 
-#define CKERR(r) if (r!=0) fprintf(stderr, "%s:%d error %d %s\n", __FILE__, __LINE__, r, db_strerror(r)); assert(r==0);
-
-int main() {
+int
+test_main(int argc, const char *argv[]) {
+    parse_args(argc, argv);
     DB_ENV * const null_env = 0;
     DB *db;
     DB_TXN * const null_txn = 0;

src/tests/test_db_assoc3.c

@@ -510,7 +510,8 @@ maybe_parse_intarg (const char *progname, const char *arg, const char *cmdname,
     }
 }
 
-int main (int argc, const char *argv[]) {
+int
+test_main (int argc, const char *argv[]) {
     const char *progname=argv[0];
     int useseed;
     int activity_count = 100000;

src/tests/test_db_close_no_open.c

@@ -16,7 +16,8 @@
 DB_ENV *env;
 DB *db;
 
-int main (int UU(argc), char UU(*argv[])) {
+int
+test_main (int UU(argc), const char UU(*argv[])) {
     int r;
     system("rm -rf " ENVDIR);
     r=toku_os_mkdir(ENVDIR, S_IRWXU+S_IRWXG+S_IRWXO);       assert(r==0);

src/tests/test_db_current_clobbers_db.c

@@ -17,7 +17,8 @@ DB_ENV *env;
 DB *db;
 DB_TXN* null_txn = NULL;
 
-int main (int UU(argc), char UU(*argv[])) {
+int
+test_main (int UU(argc), const char UU(*argv[])) {
     int r;
     system("rm -rf " ENVDIR);
     r=toku_os_mkdir(ENVDIR, S_IRWXU+S_IRWXG+S_IRWXO);    CKERR(r);

src/tests/test_db_curs2.c

@@ -481,7 +481,8 @@ usage (const char *argv1) {
     exit(1);
 }
 
-int main (int argc, const char *argv[]) {
+int
+test_main (int argc, const char *argv[]) {
     const char *progname=argv[0];
     int useseed;
 

src/tests/test_db_cursor.c

@@ -299,7 +299,8 @@ static void usage (const char *argv1) {
     exit(1);
 }
 
-int main (int argc, const char *argv[]) {
+int
+test_main (int argc, const char *argv[]) {
     const char *progname=argv[0];
     int useseed = 1; 
 

src/tests/test_db_dbt_appmalloc.c

@@ -136,7 +136,8 @@ close_dbs(void) {
     r = sdb->close(sdb, 0);     CKERR(r);
 }
 
-int main(int argc, const char *argv[]) {
+int
+test_main(int argc, const char *argv[]) {
     int i;
     
     parse_args(argc, argv);

src/tests/test_db_dbt_malloc_leak.c

@@ -269,7 +269,8 @@ cursor_setup (DBC* dbc, u_int32_t flag) {
     
 }
 
-int main(int argc, const char *argv[]) {
+int
+test_main(int argc, const char *argv[]) {
     int i;
     int r;
     DBC* dbc;

src/tests/test_db_dbt_mem_behavior.c

@@ -57,7 +57,8 @@ close_dbs (void) {
     r = db->close(db, 0);       CKERR(r);
 }
 
-int main(int argc, const char *argv[]) {
+int
+test_main(int argc, const char *argv[]) {
     int i;
     int r;
     

src/tests/test_db_delboth.c

@@ -162,7 +162,8 @@ test_db_delboth (int n, int dup_mode) {
 }
 #endif //USE_TDB
 
-int main(int argc, const char *argv[]) {
+int
+test_main(int argc, const char *argv[]) {
     parse_args(argc, argv);
 
 

src/tests/test_db_delete.c

@@ -135,7 +135,8 @@ test_db_get_datasize0 (void) {
     assert(r == 0);
 }
 
-int main(int argc, const char *argv[]) {
+int
+test_main(int argc, const char *argv[]) {
     parse_args(argc, argv);
 
     test_db_get_datasize0();

src/tests/test_db_donotindex.c

@@ -124,7 +124,8 @@ close_dbs (void) {
     r = sdb->close(sdb, 0); CKERR(r);
 }
 
-int main(int argc, const char *argv[]) {
+int
+test_main(int argc, const char *argv[]) {
     int i;
     
     parse_args(argc, argv);

src/tests/test_db_env_open_close.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
 
+#include "test.h"
+
 #include <stdio.h>
 #include <assert.h>
 #include <toku_portability.h>
 #include <db.h>
 
-int main() {
+int
+test_main(int argc, const char *argv[]) {
+    parse_args(argc, argv);
     DB_ENV *dbenv;
     int r;
 

src/tests/test_db_env_open_dir_priority.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
 
+#include "test.h"
+
 // make stdlib define unsetenv()
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
@@ -63,7 +65,9 @@ reinit_config (int set_home, int set_DB_ENVIRON, int set_DB_HOME) {
 
 }
 
-int main() {
+int
+test_main(int argc, const char *argv[]) {
+    parse_args(argc, argv);
     DB_ENV *env;
     DB_TXN * const null_txn = 0;
     DB *db;

src/tests/test_db_env_open_nocreate.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
 
+#include "test.h"
+
 // Try to open an environment where the directory does not exist 
 // Try when the dir exists but is not an initialized env
 // Try when the dir exists and we do DB_CREATE: it should work.
@@ -20,9 +22,10 @@
 #include <unistd.h>
 
 // ENVDIR is defined in the Makefile
-#define CKERR(r) if (r!=0) fprintf(stderr, "%s:%d error %d %s\n", __FILE__, __LINE__, r, db_strerror(r)); assert(r==0);
 
-int main() {
+int
+test_main(int argc, const char *argv[]) {
+    parse_args(argc, argv);
     DB_ENV *dbenv;
     int r;
     int do_private;

src/tests/test_db_env_open_open_close.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
 
+#include "test.h"
+
 #include <stdio.h>
 #include <assert.h>
 #include <toku_portability.h>
@@ -12,12 +14,10 @@
 
 // ENVDIR is defined in the Makefile
 
-#define CKERR(r) if (r!=0) fprintf(stderr, "%s:%d error %d %s\n", __FILE__, __LINE__, r, db_strerror(r)); assert(r==0);
-
-int main(int argc, char** argv) {
+int
+test_main(int argc, const char** argv) {
     DB_ENV *dbenv;
     int r;
-    int __attribute__((__unused__)) verbose = 0;
     if (argc == 2 && !strcmp(argv[1], "-v")) verbose = 1;
     
     system("rm -rf " ENVDIR);

src/tests/test_db_env_set_data_dir.c

@@ -13,7 +13,9 @@
 
 // ENVDIR is defined in the Makefile
 
-int main() {
+int
+test_main(int argc, const char *argv[]) {
+    parse_args(argc, argv);
     DB_ENV *dbenv;
     int r;
 

src/tests/test_db_env_set_errpfx.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
 
+#include "test.h"
+
 #include <stdio.h>
 #include <assert.h>
 #include <toku_portability.h>
@@ -11,7 +13,9 @@
 
 // ENVDIR is defined in the Makefile
 
-int main() {
+int
+test_main(int argc, const char *argv[]) {
+    parse_args(argc, argv);
     DB_ENV *dbenv;
     int r;
 

src/tests/test_db_env_set_lg_dir.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
 
+#include "test.h"
+
 #include <stdio.h>
 #include <assert.h>
 #include <toku_portability.h>
@@ -10,11 +12,11 @@
 #include <sys/types.h>
 #include <errno.h>
 
-#define CKERR(r) if (r!=0) fprintf(stderr, "%s:%d error %d %s\n", __FILE__, __LINE__, r, db_strerror(r)); assert(r==0);
-
 // ENVDIR is defined in the Makefile
 
-int main() {
+int
+test_main(int argc, const char *argv[]) {
+    parse_args(argc, argv);
     DB_ENV *dbenv;
     int r;
 

src/tests/test_db_env_set_tmp_dir.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
 
+#include "test.h"
+
 #include <stdio.h>
 #include <assert.h>
 #include <toku_portability.h>
@@ -10,11 +12,11 @@
 #include <sys/types.h>
 #include <errno.h>
 
-#define CKERR(r) if (r!=0) fprintf(stderr, "%s:%d error %d %s\n", __FILE__, __LINE__, r, db_strerror(r)); assert(r==0);
-
 // ENVDIR is defined in the Makefile
 
-int main() {
+int
+test_main(int argc, const char *argv[]) {
+    parse_args(argc, argv);
     DB_ENV *dbenv;
     int r;
 

src/tests/test_db_env_strdup_null.c

@@ -16,7 +16,8 @@
 DB_ENV *env;
 DB *db;
 
-int main (int UU(argc), char UU(*argv[])) {
+int
+test_main (int UU(argc), const char UU(*argv[])) {
     int r;
     r=system("rm -rf " ENVDIR);                    assert(r==0);
     r=toku_os_mkdir(ENVDIR, S_IRWXU+S_IRWXG+S_IRWXO);                         assert(r==0);

src/tests/test_db_get_put_flags.c

@@ -239,7 +239,8 @@ setup_secondary (u_int32_t flags) {
     r = dbp->associate(dbp, NULL, sdbp, identity_callback, 0);                          CKERR(r);
 }
 
-int main(int argc, const char *argv[]) {
+int
+test_main(int argc, const char *argv[]) {
     int i;
     
     parse_args(argc, argv);

src/tests/test_db_no_env.c

@@ -10,7 +10,8 @@
 
 #include "test.h"
 
-int main (int UU(argc), char UU(*argv[])) {
+int
+test_main (int UU(argc), const char UU(*argv[])) {
     DB *db;
     int r;
     r = db_create(&db, 0, 0); 

src/tests/test_db_open_notexist_reopen.c

@@ -16,7 +16,8 @@
 DB_ENV *env;
 DB *db;
 
-int main (int UU(argc), char UU(*argv[])) {
+int
+test_main (int UU(argc), const char UU(*argv[])) {
     int r;
     system("rm -rf " ENVDIR);
     r=toku_os_mkdir(ENVDIR, S_IRWXU+S_IRWXG+S_IRWXO);                                                           assert(r==0);

src/tests/test_db_remove_memleak.c

@@ -19,7 +19,8 @@ DB *db;
 DBT key;
 DBT data;
 
-int main (int UU(argc), char UU(*argv[])) {
+int
+test_main (int UU(argc), const char UU(*argv[])) {
     int r;
     system("rm -rf " ENVDIR);
     r=toku_os_mkdir(ENVDIR, S_IRWXU+S_IRWXG+S_IRWXO);         assert(r==0);

src/tests/test_db_remove_subdb.c

@@ -19,7 +19,8 @@ DB *db;
 DBT key;
 DBT data;
 
-int main (int UU(argc), char UU(*argv[])) {
+int
+test_main (int UU(argc), const char UU(*argv[])) {
     int r;
     system("rm -rf " ENVDIR);
     r=toku_os_mkdir(ENVDIR, S_IRWXU+S_IRWXG+S_IRWXO);         assert(r==0);

src/tests/test_db_secondary.c

@@ -188,7 +188,9 @@ verify_gone (void) {
     r = sdbp->pget(sdbp, null_txn, &skey, &key, &data, 0);assert(r == DB_NOTFOUND);
 }
 
-int main() {
+int
+test_main(int argc, const char *argv[]) {
+    parse_args(argc, argv);
     int r;
 
     system("rm -rf " ENVDIR);

src/tests/test_db_set_flags.c

@@ -33,7 +33,8 @@ test_db_set_flags (int flags, int expectr, int flags2, int expectr2) {
     r = db->close(db, 0); assert(r == 0);
 }
 
-int main(int argc, const char *argv[]) {
+int
+test_main(int argc, const char *argv[]) {
 
     parse_args(argc, argv);
   

src/tests/test_db_subdb.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
 
+#include "test.h"
+
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <stdio.h>
@@ -11,9 +13,9 @@
 
 // ENVDIR is defined in the Makefile
 
-#define CKERR(r) if (r!=0) fprintf(stderr, "%s:%d error %d %s\n", __FILE__, __LINE__, r, db_strerror(r)); assert(r==0);
-
-int main() {
+int
+test_main(int argc, const char *argv[]) {
+    parse_args(argc, argv);
     DB_ENV * env = 0;
     DB *db;
     DB_TXN * const null_txn = 0;

src/tests/test_db_subdb_different_flags.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
 
+#include "test.h"
+
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <stdio.h>
@@ -11,9 +13,9 @@
 
 // ENVDIR is defined in the Makefile
 
-#define CKERR(r) if (r!=0) fprintf(stderr, "%s:%d error %d %s\n", __FILE__, __LINE__, r, db_strerror(r)); assert(r==0);
-
-int main() {
+int
+test_main(int argc, const char *argv[]) {
+    parse_args(argc, argv);
     DB_ENV * env = 0;
     DB *db;
     DB_TXN * const null_txn = 0;

src/tests/test_db_txn_locks.c

@@ -873,7 +873,8 @@ test (u_int32_t dup_flags) {
 }
 
 
-int main(int argc, const char* argv[]) {
+int
+test_main(int argc, const char* argv[]) {
     parse_args(argc, argv);
     if (!IS_TDB) {
 	if (verbose) {

src/tests/test_db_txn_locks_read_uncommitted.c

@@ -216,7 +216,8 @@ test (u_int32_t dup_flags) {
 }
 
 
-int main(int argc, const char* argv[]) {
+int
+test_main(int argc, const char* argv[]) {
     parse_args(argc, argv);
     test(0);
     test(DB_DUP | DB_DUPSORT);

src/tests/test_db_version.c

@@ -7,15 +7,11 @@
 
 #include "test.h"
 
-int main (int argc, char *argv[]) {
+int
+test_main (int argc, const char *argv[]) {
     const char *v;
     int major, minor, patch;
-    int i;
-    for (i=1; i<argc; i++) {
-        char *arg = argv[i];
-        if (strcmp(arg, "-v") == 0)
-            verbose++;
-    }
+    parse_args(argc, argv);
     v = db_version(0, 0, 0);
     assert(v!=0);
     v = db_version(&major, &minor, &patch);

src/tests/test_dup_delete.c

@@ -717,7 +717,8 @@ test_i0i1ci0_search (int n, int dup_mode) {
     assert(r == 0);
 }
 
-int main(int argc, const char *argv[]) {
+int
+test_main(int argc, const char *argv[]) {
     int i;
 
     parse_args(argc, argv);

src/tests/test_dup_dup.c

@@ -218,7 +218,8 @@ test_put_00_01_01 (int dup_mode, u_int32_t put_flags) {
     r = db->close(db, 0); assert(r == 0);
 }
 
-int main(int argc, const char *argv[]) {
+int
+test_main(int argc, const char *argv[]) {
 
     int yes_overwrite=0;
     if (IS_TDB)

src/tests/test_dup_flags.c

@@ -68,7 +68,8 @@ test_dup_flags (u_int32_t dup_flags) {
     r = db->close(db, 0); assert(r == 0);
 }
 
-int main(int argc, const char *argv[]) {
+int
+test_main(int argc, const char *argv[]) {
 
     parse_args(argc, argv);
   

src/tests/test_dup_insert.c

@@ -249,7 +249,8 @@ test_nonleaf_insert (int n, int dup_mode) {
     assert(r == 0);
 }
 
-int main(int argc, const char *argv[]) {
+int
+test_main(int argc, const char *argv[]) {
     int i;
 
     parse_args(argc, argv);

src/tests/test_dup_next.c

@@ -118,7 +118,8 @@ test_dup_next (int n, int dup_mode) {
     r = db->close(db, 0); assert(r == 0);
 }
 
-int main(int argc, const char *argv[]) {
+int
+test_main(int argc, const char *argv[]) {
     int i;
     for (i = 1; i < argc; i++) {
         const char *arg = argv[i];

src/tests/test_dup_search.c

@@ -320,7 +320,8 @@ test_reverse_search (int n, int dup_mode) {
     assert(r == 0);
 }
 
-int main(int argc, const char *argv[]) {
+int
+test_main(int argc, const char *argv[]) {
     int i;
 
     parse_args(argc, argv);

src/tests/test_dupsort_del.c

@@ -99,7 +99,8 @@ test_dupsort_del (void) {
     r=env->close(env, 0); CKERR(r);
 }
 
-int main (int argc, const char *argv[]) {
+int
+test_main (int argc, const char *argv[]) {
     parse_args(argc, argv);
     test_dupsort_del();
     return 0;

src/tests/test_dupsort_del_checksum.c

@@ -106,7 +106,8 @@ test_abort3 (void) {
     r=env->close(env, 0); CKERR(r);
 }
 
-int main (int argc, const char *argv[]) {
+int
+test_main (int argc, const char *argv[]) {
     parse_args(argc, argv);
     test_abort3();
     return 0;

src/tests/test_dupsort_delete.c

@@ -96,7 +96,8 @@ test_dupsort_delete (int n) {
     r = db->close(db, 0); assert(r == 0);
 }
 
-int main(int argc, const char *argv[]) {
+int
+test_main(int argc, const char *argv[]) {
     int i;
 
     parse_args(argc, argv);

src/tests/test_dupsort_get.c

@@ -118,7 +118,8 @@ test_dupsort_get (int n, int dup_mode) {
 }
 
 
-int main(int argc, const char *argv[]) {
+int
+test_main(int argc, const char *argv[]) {
     int i;
 
     parse_args(argc, argv);

src/tests/test_dupsort_get_both.c

@@ -143,7 +143,8 @@ test_icdi_search (int n, int dup_mode) {
 }
 
 
-int main(int argc, const char *argv[]) {
+int
+test_main(int argc, const char *argv[]) {
     int i;
 
     parse_args(argc, argv);

src/tests/test_dupsort_get_both_range.c

@@ -149,7 +149,8 @@ test_icdi_search (int n, int dup_mode) {
 }
 
 
-int main(int argc, const char *argv[]) {
+int
+test_main(int argc, const char *argv[]) {
     int i;
 
     parse_args(argc, argv);

src/tests/test_dupsort_set.c

@@ -144,7 +144,8 @@ test_icdi_search (int n, int dup_mode) {
 }
 
 
-int main(int argc, const char *argv[]) {
+int
+test_main(int argc, const char *argv[]) {
     int i;
 
     parse_args(argc, argv);

src/tests/test_dupsort_set_range.c

@@ -151,7 +151,8 @@ test_icdi_search (int n, int dup_mode) {
 }
 
 
-int main(int argc, const char *argv[]) {
+int
+test_main(int argc, const char *argv[]) {
     int i;
 
     parse_args(argc, argv);

src/tests/test_env_close_flags.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
 
+#include "test.h"
+
 #include <assert.h>
 #include <toku_portability.h>
 #include <db.h>
@@ -12,9 +14,8 @@
 
 // ENVDIR is defined in the Makefile
 
-#define CKERR(r) if (r!=0) fprintf(stderr, "%s:%d error %d %s\n", __FILE__, __LINE__, r, db_strerror(r)); assert(r==0);
-
-int main (int argc __attribute__((__unused__)), char *argv[]  __attribute__((__unused__))) {
+int
+test_main (int argc __attribute__((__unused__)), const char *argv[]  __attribute__((__unused__))) {
     DB_ENV *env;
     int r;
     system("rm -rf " ENVDIR);

src/tests/test_env_create_db_create.c

@@ -10,7 +10,8 @@
 
 #include "test.h"
 
-int main (int UU(argc), char UU(*argv[])) {
+int
+test_main (int UU(argc), const char UU(*argv[])) {
     DB_ENV *env;
     DB *db;
     int r;

src/tests/test_env_open_flags.c

@@ -31,7 +31,8 @@ test_env_open_flags (int env_open_flags, int expectr) {
     assert(r == 0);
 }
 
-int main(int argc, const char *argv[]) {
+int
+test_main(int argc, const char *argv[]) {
 
     parse_args(argc, argv);
   

src/tests/test_error.c

@@ -13,7 +13,8 @@ handle_error (const DB_ENV *UU(dbenv), const char *errpfx, const char *UU(msg))
     assert(errpfx==expect_errpfx);
     n_handle_error++;
 }
-int main (int argc, const char *argv[]) {
+int
+test_main (int argc, const char *argv[]) {
     parse_args(argc, argv);
 
 #if defined(OSX)

src/tests/test_forkjoin.c

 #include <stdio.h>
 #include <assert.h>
+
+#include "test.h"
 #include <toku_pthread.h>
 
 static void *
@@ -8,7 +10,9 @@ f (void *arg) {
     return arg;
 }
 
-int main() {
+int
+test_main(int argc, const char *argv[]) {
+    parse_args(argc, argv);
     toku_pthread_t t;
     int r = toku_pthread_create(&t, 0, f, 0); assert(r == 0);
     void *ret;

src/tests/test_get_both_range.c

@@ -102,7 +102,8 @@ static void test_get_both(int n, int dup_mode, int op) {
 }
 
 
-int main(int argc, const char *argv[]) {
+int
+test_main(int argc, const char *argv[]) {
     unsigned long doi=0;
     int i;
     char flags = 0;