Addresses #1032, #1343

All src/tests now have the following first 3 lines:
1- Modeline
2- Ident
3- include test.h
(test.h includes toku_portability.h immediately after modeline and ident)

Only one include for test.h, and no (direct) includes for toku_portability.h

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

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

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 /* Test to see if a big nested transaction (so big that it's rollbacks spill into a file)
  * can commit properly. 
  *  Four Tests:
@@ -9,10 +10,8 @@
  *     big child commits, parent commits
  */
 
-#include <toku_portability.h>
 #include <db.h>
 #include <sys/stat.h>
-#include "test.h"
 
 int N = 50000;
 

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

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 /* Test to see if a big nested transaction (so big that it's rollbacks spill into a file)
  * can commit properly. 
  *  Four Tests:
@@ -9,10 +10,8 @@
  *     big child commits, parent commits
  */
 
-#include <toku_portability.h>
 #include <db.h>
 #include <sys/stat.h>
-#include "test.h"
 
 int N = 50000;
 

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

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 /* Test to see if a big nested transaction (so big that it's rollbacks spill into a file)
  * can commit properly. 
  *  Four Tests:
@@ -9,10 +10,8 @@
  *     big child commits, parent commits
  */
 
-#include <toku_portability.h>
 #include <db.h>
 #include <sys/stat.h>
-#include "test.h"
 
 int N = 50000;
 

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

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 /* Test to see if a big nested transaction (so big that it's rollbacks spill into a file)
  * can commit properly. 
  *  Four Tests:
@@ -9,10 +10,8 @@
  *     big child commits, parent commits (This test)
  */
 
-#include <toku_portability.h>
 #include <db.h>
 #include <sys/stat.h>
-#include "test.h"
 
 static DB_ENV *env;
 static DB *db;

src/tests/bug627.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 /* See #627. */
 
-#include "test.h"
 #include <sys/stat.h>
 #include <memory.h>
 

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

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 #include <db.h>
 #include <sys/stat.h>
-#include "test.h"
 
 static DB_ENV *env;
 static DB *db;

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

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 #include <db.h>
 #include <sys/stat.h>
-#include "test.h"
 
 static DB_ENV *env;
 static DB *db;

src/tests/helgrind1.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 // The helgrind1.tdbrun test should fail.  This is merely a check to verify that helgrind actually notices a race.
 #include <assert.h>
 #include <pthread.h>
-#include "test.h"
 int x;
 
 void *starta(void* ignore __attribute__((__unused__))) {

src/tests/helgrind2.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 // The helgrind2 test performs a DB->get() in two different concurrent threads.
 #include <arpa/inet.h>
 #include <assert.h>
@@ -8,7 +9,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <memory.h>
-#include "test.h"
 
 DB_ENV *env;
 DB *db;

src/tests/helgrind3.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 // The helgrind2 test performs a DB->get() in two different concurrent threads.
 #include <arpa/inet.h>
 #include <assert.h>
@@ -8,7 +9,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <memory.h>
-#include "test.h"
 
 DB_ENV *env;
 DB *db;

src/tests/keyrange-dupsort-unflat.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
-#ident "Copyright (c) 2008 Tokutek Inc.  All rights reserved."
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <assert.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <unistd.h>
 #include <sys/stat.h>
-#include "test.h"
 
 static DB_ENV *env;
 static DB_TXN *txn = 0;

src/tests/keyrange-dupsort.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
-#ident "Copyright (c) 2008 Tokutek Inc.  All rights reserved."
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <assert.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <unistd.h>
 #include <sys/stat.h>
-#include "test.h"
 
 static DB_ENV *env;
 static DB_TXN *txn = 0;

src/tests/keyrange-unflat.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
-#ident "Copyright (c) 2008 Tokutek Inc.  All rights reserved."
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <assert.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <unistd.h>
 #include <sys/stat.h>
-#include "test.h"
 
 static DB_ENV *env;
 static DB_TXN *txn = 0;

src/tests/keyrange.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
-#ident "Copyright (c) 2008 Tokutek Inc.  All rights reserved."
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <assert.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <unistd.h>
 #include <sys/stat.h>
-#include "test.h"
 
 static DB_ENV *env;
 static DB_TXN *txn = 0;

src/tests/manyfiles.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 /* How fast can we do insertions when there are many files? */
 
-#include <toku_portability.h>
 #include <db.h>
 #include <sys/stat.h>
-#include "test.h"
 
 #define NFILES 1000
 #define NINSERTS_PER 1000

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

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 /* Test to see if a medium-size nested transaction (the nested pieces are not too big, but the whole thing is so big that it's rollbacks spill into a file)
  * can commit properly. 
  *  Four Tests:
@@ -9,10 +10,8 @@
  *     big child commits, parent commits (This test)
  */
 
-#include <toku_portability.h>
 #include <db.h>
 #include <sys/stat.h>
-#include "test.h"
 
 static DB_ENV *env;
 static DB *db;

src/tests/test-recover1.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 /* A simple case to see if recovery works. */
 
-#include <toku_portability.h>
 #include <db.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <memory.h>
 
-#include "test.h"
 
 static void test (void) {
     int r;

src/tests/test-recover2.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 /* A simple case to see if recovery works. */
 
-#include <toku_portability.h>
 #include <db.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <memory.h>
 
-#include "test.h"
 
 static void test (void) {
     int r;

src/tests/test-recover3.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 // A simple case to see if recovery works.
 //   Create a file (foo.db) in a transaction and commit.
 //   Insert some random key-value pairs in a transaciton an dcommit.
@@ -7,14 +8,12 @@
 //   run recovery.
 //   Verify that the data is present.
 
-#include <toku_portability.h>
 #include <db.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <memory.h>
 
-#include "test.h"
 
 static void test (void) {
     int r;

src/tests/test.h

-#include "toku_portability.h"
+/* -*- mode: C; c-basic-offset: 4 -*- */
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include <toku_portability.h>
+
 #include <string.h>
 #include <stdlib.h>
 #include <stdint.h>

src/tests/test938.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 #include <db.h>
 #include <sys/stat.h>
-#include "test.h"
 
 unsigned char N=5;
 

src/tests/test938b.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 #include <db.h>
 #include <sys/stat.h>
-#include "test.h"
 
 DB_ENV *env;
 DB *db;

src/tests/test938c.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 #include <db.h>
 #include <sys/stat.h>
-#include "test.h"
 
 unsigned char N=5;
 

src/tests/test944.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 #include <db.h>
 #include <sys/stat.h>
-#include "test.h"
 
 unsigned char N=8;
 

src/tests/test944a.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 #include <db.h>
 #include <sys/stat.h>
-#include "test.h"
 
 unsigned char N=8;
 

src/tests/test_789.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 #include <stdio.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <memory.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <memory.h>
-#include "test.h"
 
 static void
 test_789(void) {

src/tests/test_935.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 #include <stdio.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <memory.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <memory.h>
-#include "test.h"
 
 static void
 testit (const int klen, const int vlen, const int n, const int lastvlen) {

src/tests/test_abort1.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 /* Simple test of logging.  Can I start a TokuDB with logging enabled? */
 #include <assert.h>
@@ -8,12 +8,10 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <memory.h>
 #include <stdio.h>
 
-#include "test.h"
 
 // ENVDIR is defined in the Makefile
 

src/tests/test_abort2.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 /* Put some insert messages into an internal buffer (by first creating a DB, filling it up, then closing it, and reopening, and inserting a few things)
  * Then perform a transaction that overwrites some of those internal things.
  * Then abort the transaction.
  * Make sure those middle things made it back into the tree.
  */
 
-#include <toku_portability.h>
 #include <db.h>
 #include <sys/stat.h>
-#include "test.h"
 
 static DB_ENV *env;
 static DB *db;

src/tests/test_abort3.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 /* Try to exercise all the cases for the leafcommands in brt.c
  */
 
 
-#include <toku_portability.h>
 #include <db.h>
 #include <sys/stat.h>
-#include "test.h"
 
 static DB_ENV *env;
 static DB *db;

src/tests/test_abort_delete_first.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 /* Test what happens if we have deleted the first thing in the database.
  * Also the last.
  * Also if we've deleted a lot of stuff, so that the first good thing is not on the first page.
  */
 
-#include <toku_portability.h>
 #include <db.h>
 #include <sys/stat.h>
-#include "test.h"
 
 static DB_ENV *env;
 static DB *db;

src/tests/test_archive0.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 /* Test log archive. */
-#include <toku_portability.h>
 #include <db.h>
 #include <sys/stat.h>
-#include "test.h"
 
 
 

src/tests/test_archive1.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 /* Test log archive. */
-#include <toku_portability.h>
 #include <db.h>
 #include <sys/stat.h>
 #include <memory.h>
-#include "test.h"
 
 int
 test_main (int argc, const char *argv[]) {

src/tests/test_archive2.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 /* Test log archive. */
-#include <toku_portability.h>
 #include <db.h>
 #include <sys/stat.h>
-#include "test.h"
 
 int
 test_main (int argc, const char *argv[]) {

src/tests/test_cachesize.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -9,10 +9,8 @@
 #include <memory.h>
 #include <inttypes.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 
 static u_int64_t
 size_from (u_int32_t gbytes, u_int32_t bytes) {

src/tests/test_cursor_2.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -9,10 +9,8 @@
 #include <memory.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 
 static void
 test_cursor (void) {

src/tests/test_cursor_3.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 // Verify that different cursors return different data items when DBT is given no flags.
 
-#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -11,10 +11,8 @@
 #include <memory.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 
 static void
 verify_distinct_pointers (void **ptrs, int n) {

src/tests/test_cursor_DB_NEXT_no_dup.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -9,10 +9,8 @@
 #include <memory.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 
 static DBC* cursor      = NULL;
 static DB*  db          = NULL;

src/tests/test_cursor_db_current.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -8,11 +8,9 @@
 #include <unistd.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <memory.h>
 #include <db.h>
 
-#include "test.h"
 
 static void
 db_put (DB *db, int k, int v) {

src/tests/test_cursor_delete.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -9,10 +9,8 @@
 #include <memory.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 
 static void
 cursor_expect (DBC *cursor, int k, int v, int op) {

src/tests/test_cursor_delete2.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
-#ident "Copyright (c) 2007,2008 Tokutek Inc.  All rights reserved."
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -9,10 +9,8 @@
 #include <memory.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 
 static DB_ENV *dbenv;
 static DB *db;

src/tests/test_cursor_delete2a.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
-#ident "Copyright (c) 2007,2008 Tokutek Inc.  All rights reserved."
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -9,10 +9,8 @@
 #include <memory.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 
 static DB_ENV *dbenv;
 static DB *db;

src/tests/test_cursor_delete_next.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <memory.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <assert.h>
 #include <errno.h>
 #include <sys/stat.h>
 
-#include "test.h"
 
 // ENVDIR is defined in the Makefile
 

src/tests/test_cursor_flags.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -9,10 +9,8 @@
 #include <memory.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 
 static void
 test_cursor_flags (int cursor_flags, int expectr) {

src/tests/test_cursor_nonleaf_expand.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -8,10 +8,8 @@
 #include <unistd.h>
 #include <memory.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 
 static void
 expect_cursor_get (DBC *cursor, int k, int v, int op) {

src/tests/test_cursor_null.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <memory.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <assert.h>
 #include <errno.h>
 #include <sys/stat.h>
 
-#include "test.h"
 
 // ENVDIR is defined in the Makefile
 

src/tests/test_cursor_stickyness.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -8,10 +8,8 @@
 #include <unistd.h>
 #include <memory.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 
 
 static void

src/tests/test_db_already_exists.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
-
 #include "test.h"
 
+
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <stdio.h>
 #include <assert.h>
 #include <unistd.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <errno.h>
 

src/tests/test_db_assoc3.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 /* Primary with two associated things. */
 
 #include <assert.h>
@@ -8,9 +9,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <memory.h>
-#include <toku_portability.h>
 
-#include "test.h"
 
 enum mode {
     MODE_DEFAULT, MODE_DB_CREATE, MODE_MORE

src/tests/test_db_close_no_open.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 /* Can I close a db without opening it? */
 #include <assert.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 
 // ENVDIR is defined in the Makefile
 

src/tests/test_db_current_clobbers_db.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 /* DB_CURRENT */
 #include <assert.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 
 // ENVDIR is defined in the Makefile
 

src/tests/test_db_curs2.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 /* Primary with two associated things. */
 
 #include <assert.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <errno.h>
 #include <memory.h>
@@ -11,7 +11,6 @@
 #include <unistd.h>
 #include <ctype.h>
 
-#include "test.h"
 
 static int oppass,opnum;
 

src/tests/test_db_cursor.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 /* Primary with two associated things. */
 
 #include <assert.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <errno.h>
 #include <memory.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "test.h"
 
 static enum mode {
     MODE_DEFAULT, MODE_MORE

src/tests/test_db_dbt_appmalloc.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <memory.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <assert.h>
 #include <errno.h>
 #include <sys/stat.h>
 
-#include "test.h"
 
 // ENVDIR is defined in the Makefile
 

src/tests/test_db_dbt_malloc_leak.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <memory.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <assert.h>
 #include <errno.h>
 #include <sys/stat.h>
 
-#include "test.h"
 
 // ENVDIR is defined in the Makefile
 

src/tests/test_db_dbt_mem_behavior.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <memory.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <assert.h>
 #include <errno.h>
 #include <sys/stat.h>
 
-#include "test.h"
 
 // ENVDIR is defined in the Makefile
 

src/tests/test_db_delboth.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -9,10 +9,8 @@
 #include <memory.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 
 #ifdef USE_TDB
 enum {INFLATE=128};

src/tests/test_db_delete.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -9,10 +9,8 @@
 #include <memory.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 
 
 

src/tests/test_db_donotindex.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <memory.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <assert.h>
 #include <errno.h>
 #include <sys/stat.h>
 
-#include "test.h"
 
 // ENVDIR is defined in the Makefile
 

src/tests/test_db_env_open_close.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #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

src/tests/test_db_env_open_dir_priority.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
-
 #include "test.h"
 
+
 // make stdlib define unsetenv()
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
@@ -13,7 +12,6 @@
 #include <limits.h>
 #include <stdio.h>
 #include <assert.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <stdlib.h>
 #include <sys/stat.h>

src/tests/test_db_env_open_nocreate.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #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.
@@ -12,7 +11,6 @@
 //   One must actually create a DB I think...
 
 #include <assert.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <errno.h>
 #include <stdio.h>

src/tests/test_db_env_open_open_close.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #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>
 #include <stdlib.h>
 #include <sys/stat.h>

src/tests/test_db_env_set_data_dir.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #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>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <errno.h>
-#include "test.h"
 
 // ENVDIR is defined in the Makefile
 

src/tests/test_db_env_set_errpfx.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #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>
 #include <stdlib.h>
 #include <sys/stat.h>

src/tests/test_db_env_set_lg_dir.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #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>
 #include <stdlib.h>
 #include <sys/stat.h>

src/tests/test_db_env_set_tmp_dir.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #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>
 #include <stdlib.h>
 #include <sys/stat.h>

src/tests/test_db_env_strdup_null.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 /* Do I return EINVAL when passing in NULL for something that would otherwise be strdup'd? */
 #include <assert.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <errno.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 
 // ENVDIR is defined in the Makefile
 

src/tests/test_db_get_put_flags.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <memory.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <assert.h>
 #include <errno.h>
 #include <sys/stat.h>
 
-#include "test.h"
 
 // ENVDIR is defined in the Makefile
 

src/tests/test_db_no_env.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <assert.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 
 int
 test_main (int UU(argc), const char UU(*argv[])) {

src/tests/test_db_open_notexist_reopen.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 /* Simple test of logging.  Can I start a TokuDB with logging enabled? */
 #include <assert.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <errno.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 
 // ENVDIR is defined in the Makefile
 

src/tests/test_db_remove.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
-#include <toku_portability.h>
-#include <fcntl.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
 #include "test.h"
+#include <fcntl.h>
 
 DB_ENV * const null_env = 0;
 DB *db1, *db2;

src/tests/test_db_remove_memleak.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 /* Does removing a database free the DB structure's memory? */
 #include <assert.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <errno.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <memory.h>
 
-#include "test.h"
 
 // ENVDIR is defined in the Makefile
 

src/tests/test_db_remove_subdb.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 /* Does removing subdatabases corrupt the db file/other dbs in that file? (when nothing else open) */
 #include <assert.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <errno.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <memory.h>
 
-#include "test.h"
 
 // ENVDIR is defined in the Makefile
 

src/tests/test_db_secondary.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <memory.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <assert.h>
 #include <errno.h>
 #include <sys/stat.h>
 
-#include "test.h"
 
 // ENVDIR is defined in the Makefile
 

src/tests/test_db_set_flags.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -9,10 +9,8 @@
 #include <memory.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 
 static void
 test_db_set_flags (int flags, int expectr, int flags2, int expectr2) {

src/tests/test_db_subdb.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
-
 #include "test.h"
 
+
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <stdio.h>
 #include <assert.h>
 #include <unistd.h>
-#include <toku_portability.h>
 #include <db.h>
 
 // ENVDIR is defined in the Makefile

src/tests/test_db_subdb_different_flags.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
-
 #include "test.h"
 
+
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <stdio.h>
 #include <assert.h>
 #include <unistd.h>
-#include <toku_portability.h>
 #include <db.h>
 
 // ENVDIR is defined in the Makefile

src/tests/test_db_txn_locks.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <memory.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <assert.h>
 #include <errno.h>
 #include <sys/stat.h>
 
-#include "test.h"
 
 struct heavi_extra {
     DBT key;

src/tests/test_db_txn_locks_read_uncommitted.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <memory.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <assert.h>
 #include <errno.h>
 #include <sys/stat.h>
 
-#include "test.h"
 
 // ENVDIR is defined in the Makefile
 

src/tests/test_db_version.c

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

src/tests/test_dup_delete.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -8,10 +8,8 @@
 #include <unistd.h>
 #include <memory.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 
 static void
 db_put (DB *db, int k, int v) {

src/tests/test_dup_dup.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -8,11 +8,9 @@
 #include <unistd.h>
 #include <memory.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <errno.h>
 
-#include "test.h"
 
 int errors;
 

src/tests/test_dup_flags.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -8,10 +8,8 @@
 #include <unistd.h>
 #include <memory.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 
 /* verify that the dup flags are written and read from the database file correctly */ 
 static void

src/tests/test_dup_insert.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -8,10 +8,8 @@
 #include <unistd.h>
 #include <memory.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 
 static void
 db_put (DB *db, int k, int v) {

src/tests/test_dup_next.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 /* test the cursor DB_NEXT_DUP operation */
 
-#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -11,10 +11,8 @@
 #include <memory.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 
 static int testlevel = 0;
 

src/tests/test_dup_search.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -8,10 +8,8 @@
 #include <unistd.h>
 #include <memory.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 
 
 

src/tests/test_dupsort_del.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 /* Test to see if delete works right with dupsort.
  * The issue is that things might look OK before the commit, but bad after the commit.
  */
 
-#include <toku_portability.h>
 #include <db.h>
 #include <sys/stat.h>
-#include "test.h"
 
 static DB_ENV *env;
 static DB *db;

src/tests/test_dupsort_del_checksum.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 /* Test to see if delete works right with dupsort.
  * The issue is that things might look OK before the commit, but bad after the commit.
  * In #690 we saw corrupted checksum errors.  This actually tries to get that error to occur, whereas
  *  test_dupsort_del.c notices that the wrong thing is being saved.
  */
 
-#include <toku_portability.h>
 #include <db.h>
 #include <sys/stat.h>
-#include "test.h"
 
 static DB_ENV *env;
 static DB *db;

src/tests/test_dupsort_delete.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -8,10 +8,8 @@
 #include <unistd.h>
 #include <memory.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 
 static void
 db_put (DB *db, int k, int v) {

src/tests/test_dupsort_get.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -8,10 +8,8 @@
 #include <unistd.h>
 #include <memory.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 
 
 

src/tests/test_dupsort_get_both.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -8,10 +8,8 @@
 #include <unistd.h>
 #include <memory.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 
 static void
 db_put (DB *db, int k, int v) {

src/tests/test_dupsort_get_both_range.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -8,10 +8,8 @@
 #include <unistd.h>
 #include <memory.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 
 static void
 db_put (DB *db, int k, int v) {

src/tests/test_dupsort_set.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -8,10 +8,8 @@
 #include <unistd.h>
 #include <memory.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 
 static void
 db_put (DB *db, int k, int v) {

src/tests/test_dupsort_set_range.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -8,10 +8,8 @@
 #include <unistd.h>
 #include <memory.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 
 #ifndef DB_DELETE_ANY
 #define DB_DELETE_ANY 0

src/tests/test_env_close_flags.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
-
 #include "test.h"
 
+
 #include <assert.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <errno.h>
 #include <stdlib.h>

src/tests/test_env_create_db_create.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <assert.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 
 int
 test_main (int UU(argc), const char UU(*argv[])) {

src/tests/test_env_open_flags.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -9,10 +9,8 @@
 #include <memory.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 
 static void
 test_env_open_flags (int env_open_flags, int expectr) {

src/tests/test_error.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 #include <assert.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <stdio.h>
 #include <unistd.h>
-#include "test.h"
 
 char const* expect_errpfx;
 int n_handle_error=0;

src/tests/test_forkjoin.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 #include <stdio.h>
 #include <assert.h>
 
-#include "test.h"
 #include <toku_pthread.h>
 
 static void *

src/tests/test_get_both_range.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -8,10 +8,8 @@
 #include <unistd.h>
 #include <memory.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 
 static DBT *
 dbt_init_user (DBT *d, void *uptr, int ulen) {

src/tests/test_get_zeroed_dbt.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 /* Test to see if DB->get works on a zeroed DBT. */
 
-#include <toku_portability.h>
 #include <db.h>
 #include <memory.h>
 #include <stdlib.h>
 #include <assert.h>
 #include <sys/stat.h>
 
-#include "test.h"
 
 
 static void

src/tests/test_groupcommit_count.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 /* Test by counting the fsyncs, to see if group commit is working. */
 
-#include <toku_portability.h>
 #include <db.h>
 #include <toku_pthread.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include "test.h"
 
 DB_ENV *env;
 DB *db;

src/tests/test_groupcommit_perf.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 /* Test using performance metrics only, to see if group commit is working. */
 
-#include <toku_portability.h>
 #include <db.h>
 #include <toku_pthread.h>
 #include <sys/stat.h>
-#include "test.h"
 
 DB_ENV *env;
 DB *db;

src/tests/test_hsoc.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -8,10 +8,8 @@
 #include <unistd.h>
 #include <memory.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 
 #ifdef USE_BDB
 #define DB_YESOVERWRITE 0

src/tests/test_insert_cursor_delete_insert.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -8,10 +8,8 @@
 #include <unistd.h>
 #include <memory.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 
 static void
 test_insert_delete_insert (int dup_mode) {

src/tests/test_insert_memleak.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -8,10 +8,8 @@
 #include <unistd.h>
 #include <memory.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 
 static void
 test_insert (int n, int dup_mode) {

src/tests/test_kv_limits.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -8,10 +8,8 @@
 #include <unistd.h>
 #include <memory.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 
 u_int64_t lorange = 0;
 u_int64_t hirange = 1<<24;

src/tests/test_log0.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 /* Simple test of logging.  Can I start a TokuDB with logging enabled? */
 #include <assert.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 
 // ENVDIR is defined in the Makefile
 

src/tests/test_log1.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 /* Simple test of logging.  Can I start a TokuDB with logging enabled? */
 #include <assert.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <memory.h>
 #include <stdio.h>
 #include <errno.h>
 
-#include "test.h"
 
 // ENVDIR is defined in the Makefile
 

src/tests/test_log10.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
-
 #include "test.h"
 
+
 /* Test to see if we can do logging and recovery. */
 /* This is very specific to TokuDB.  It won't work with Berkeley DB. */
 /* This test_log10 inserts to a db, closes, reopens, and inserts more to db.  We want to make sure that the recovery of the buffers works. */
 /* Lots of stuff gets inserted. */
 
 #include <assert.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <stdlib.h>
 #include <sys/stat.h>

src/tests/test_log1_abort.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 /* Do test_log1, except abort instead of commit. */
 
 #include <assert.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <errno.h>
 #include <stdio.h>
@@ -14,7 +13,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "test.h"
 
 // ENVDIR is defined in the Makefile
 

src/tests/test_log2.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
-
 #include "test.h"
 
+
 /* Test to see if we can do logging and recovery. */
 /* This is very specific to TokuDB.  It won't work with Berkeley DB. */
 
 #include <assert.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <stdlib.h>
 #include <sys/stat.h>

src/tests/test_log2_abort.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
-
 #include "test.h"
 
+
 /* Like test_log2 except abort. */
 /* This is very specific to TokuDB.  It won't work with Berkeley DB. */
 
 #include <assert.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <stdlib.h>
 #include <sys/stat.h>

src/tests/test_log3.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
-
 #include "test.h"
 
+
 /* Test to see if we can do logging and recovery. */
 /* This is very specific to TokuDB.  It won't work with Berkeley DB. */
 
 #include <assert.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <stdlib.h>
 #include <sys/stat.h>

src/tests/test_log3_abort.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
-
 #include "test.h"
 
+
 /* Like test_log3 except do abort */
 
 #include <assert.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <stdlib.h>
 #include <sys/stat.h>

src/tests/test_log4.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
-
 #include "test.h"
 
+
 /* Test to see if we can do logging and recovery. */
 /* This is very specific to TokuDB.  It won't work with Berkeley DB. */
 
 #include <assert.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <stdlib.h>
 #include <sys/stat.h>

src/tests/test_log4_abort.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
-
 #include "test.h"
 
+
 /* Like test_log4, except abort */
 
 #include <assert.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <stdlib.h>
 #include <sys/stat.h>

src/tests/test_log5.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
-
 #include "test.h"
 
+
 /* Test to see if we can do logging and recovery. */
 /* This is very specific to TokuDB.  It won't work with Berkeley DB. */
 
 #include <assert.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <stdlib.h>
 #include <sys/stat.h>

src/tests/test_log5_abort.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
-
 #include "test.h"
 
+
 /* Like test_log5 except abort. */
 
 #include <assert.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <stdlib.h>
 #include <sys/stat.h>

src/tests/test_log6.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
-
 #include "test.h"
 
+
 /* Test to see if we can do logging and recovery. */
 /* This is very specific to TokuDB.  It won't work with Berkeley DB. */
 
 #include <assert.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <stdlib.h>
 #include <sys/stat.h>

src/tests/test_log6_abort.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
-
 #include "test.h"
 
+
 /* Like test_log6 except abort. */
 
 #include <assert.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <stdlib.h>
 #include <sys/stat.h>

src/tests/test_log6a_abort.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 /* Like test_log6 except abort.
  * And abort some stuff, but not others (unlike test_log6_abort which aborts everything) */
 
 #include <assert.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <stdlib.h>
 #include <search.h>
@@ -14,7 +13,6 @@
 #include <sys/types.h>
 #include <memory.h>
 
-#include "test.h"
 
 #ifndef DB_DELETE_ANY
 #define DB_DELETE_ANY 0 

src/tests/test_log7.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
-
 #include "test.h"
 
+
 /* Test to see if we can do logging and recovery. */
 /* This is very specific to TokuDB.  It won't work with Berkeley DB. */
 /* This test_log7 is like test_log5 except maxcount is larger. */
 
 #include <assert.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <stdlib.h>
 #include <sys/stat.h>

src/tests/test_log8.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
-
 #include "test.h"
 
+
 /* Test to see if we can do logging and recovery. */
 /* This is very specific to TokuDB.  It won't work with Berkeley DB. */
 /* This test_log8 inserts to a db, closes, reopens, and inserts more to db.  We want to make sure that the recovery of the buffers works. */
 
 #include <assert.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <stdlib.h>
 #include <sys/stat.h>

src/tests/test_log9.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
-
 #include "test.h"
 
+
 /* Test to see if we can do logging and recovery. */
 /* This is very specific to TokuDB.  It won't work with Berkeley DB. */
 /* This test_log8 inserts to a db, closes, reopens, and inserts more to db.  We want to make sure that the recovery of the buffers works. */
 
 #include <assert.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <stdlib.h>
 #include <sys/stat.h>

src/tests/test_logflush.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
-#include <toku_portability.h>
 #include <db.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <sys/mman.h>
-#include "test.h"
 
 // Return the offset
 static int

src/tests/test_logmax.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
-#include <toku_portability.h>
 #include <db.h>
 #include <dirent.h>
 #include <fcntl.h>
 #include <sys/stat.h>
-#include "test.h"
 
 static void
 check_logmax (int max) {

src/tests/test_mostly_seq.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
 #include <sys/stat.h>
 #include <time.h>
-#include <toku_portability.h>
 #include <db.h>
-#include "test.h"
 
 static void
 seqinsert (int n, float p) {

src/tests/test_nested.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 /* Nested transactions. */
 
-#include <toku_portability.h>
 #include <db.h>
 #include <sys/stat.h>
-#include "test.h"
 
 static DB_ENV *env;
 static DB *db;

src/tests/test_nodup_set.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -8,10 +8,8 @@
 #include <unistd.h>
 #include <memory.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 
 
 

src/tests/test_rand_insert.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -8,10 +8,8 @@
 #include <unistd.h>
 #include <memory.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 
 static void
 test_rand_insert (int n, int dup_mode) {

src/tests/test_reverse_compare_fun.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 /* try a reverse compare function to verify that the database always uses the application's
    compare function */
 
 #include <assert.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -15,7 +14,6 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "test.h"
 
 static int
 keycompare (const void *key1, unsigned int key1len, const void *key2, unsigned int key2len) {

src/tests/test_set_func_malloc.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
-
 #define DONT_DEPRECATE_MALLOC
-#include <toku_portability.h>
+#include "test.h"
+
 
 /* Test to see if setting malloc works, and if dlmalloc works. */
 
-#include <toku_portability.h>
 #include <memory.h>
 #include <db.h>
 #ifdef USE_TDB
 #include <dlmalloc.h>
 #endif
-#include "test.h"
 
 static int malloc_counter=0;
 static int realloc_counter=0;

src/tests/test_set_lk_max_locks.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 /* Test to see if the set_lk_max_locks works. */
 /* This is very specific to TokuDB.  It won't work with Berkeley DB. */
 
 #include <assert.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <memory.h>
-#include "test.h"
 
 // ENVDIR is defined in the Makefile
 

src/tests/test_thread_flags.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <assert.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <memory.h>
-#include "test.h"
 
 const char *dbfile = ENVDIR "/" "test.db";
 const char *dbname = 0;

src/tests/test_thread_insert.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <assert.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <toku_pthread.h>
-#include "test.h"
 
 static inline unsigned int getmyid() {
     return toku_os_gettid();

src/tests/test_thread_secondary.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <memory.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <assert.h>
 #include <errno.h>
 #include <sys/stat.h>
 
-#include "test.h"
 
 // ENVDIR is defined in the Makefile
 

src/tests/test_thread_stack.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <assert.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <toku_pthread.h>
-#include "test.h"
 
 typedef unsigned int my_t;
 

src/tests/test_truncate.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 // truncate a database without transactions and verify that
 // the database is empty after the truncate is performed
 
@@ -8,9 +9,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
-#include "test.h"
 
 static int
 test_truncate (int n) {

src/tests/test_truncate_subdb.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 // truncate a named database
 // verify that the database is empty
 
@@ -8,9 +9,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
-#include "test.h"
 
 static int
 test_truncate_subdb (int n) {

src/tests/test_truncate_txn_abort.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 // truncate a database within a transaction
 // abort the transaction and verify that the database is not empty
 
@@ -8,9 +9,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
-#include "test.h"
 
 static int
 test_truncate_txn_abort (int n) {

src/tests/test_truncate_txn_commit.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 // truncate a database within a transaction
 // commit the transaction and verify that the database is empty
 
@@ -8,9 +9,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
-#include "test.h"
 
 static int
 test_truncate_txn_commit (int n) {

src/tests/test_truncate_txn_commit2.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 // truncate a database within a transaction
 // begin txn; insert (n,n); truncate; commit
 // verify that the database is empty
@@ -9,9 +10,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
-#include "test.h"
 
 static int
 test_truncate_txn_commit2 (int n) {

src/tests/test_truncate_txn_commit3.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 // truncate a database within a transaction
 // begin txn; delete 0; truncate; commit
 // verify that the database is empty
@@ -9,9 +10,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
-#include "test.h"
 
 static int
 test_truncate_txn_commit2 (int n) {

src/tests/test_truncate_with_cursors.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 // truncate a database with open cursors
 // verify that the truncate returns EINVAL
 // BDB returns 0 but calls the error callback
@@ -9,9 +10,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
-#include "test.h"
 
 #ifdef USE_BDB
 int test_errors = 0;

src/tests/test_txn_abort5.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 #include <stdio.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <memory.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
-#include "test.h"
 
 static void
 test_txn_abort (int n) {

src/tests/test_txn_abort5a.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 #include <stdio.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <memory.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
-#include "test.h"
 
 
 static void

src/tests/test_txn_abort6.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 #include <stdio.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <memory.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
-#include "test.h"
 
 #define N_TXNS 4
 

src/tests/test_txn_abort7.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 #include <stdio.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <memory.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
-#include "test.h"
 
 static void
 test_abort_create (void) {

src/tests/test_txn_abort8.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 #include <stdio.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <memory.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
-#include "test.h"
 
 // 
 static void

src/tests/test_txn_abort9.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 #include <stdio.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <memory.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
-#include "test.h"
 
 // 
 static void

src/tests/test_txn_begin_commit.c

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

src/tests/test_txn_close_open_commit.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 #include <stdio.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <memory.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
-#include "test.h"
 
 // Recreate a mysqld crash by closing and opening a db within a transaction.
 // The crash occurs when writing a dirty cachetable pair, so we insert one

src/tests/test_txn_commit8.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 #include <stdio.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <memory.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
-#include "test.h"
 
 // like test_txn_abort8.c except commit
 static void

src/tests/test_txn_cursor_last.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -9,10 +9,8 @@
 #include <memory.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 
 static int
 db_put (DB *db, DB_TXN *txn, int k, int v) {

src/tests/test_txn_nested_abort.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -9,10 +9,8 @@
 #include <memory.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 
 static int
 db_put (DB *db, DB_TXN *txn, int k, int v) {

src/tests/test_txn_nested_abort2.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 #include <stdio.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <memory.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
-#include "test.h"
 
 static void
 test_txn_abort (void) {

src/tests/test_txn_nested_abort3.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 #include <stdio.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <memory.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
-#include "test.h"
 
 static void
 test_txn_abort (void) {

src/tests/test_txn_nested_abort4.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 #include <stdio.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <memory.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
-#include "test.h"
 
 static DB *db;
 static DB_ENV *env;

src/tests/test_txn_recover3.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -9,10 +9,8 @@
 #include <memory.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 
 static void
 test_txn_recover3 (int nrows) {

src/tests/test_unused_memory_crash.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -8,10 +8,8 @@
 #include <unistd.h>
 #include <memory.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 
 static void
 expect_cursor_get (DBC *cursor, int k, int v, int op) {

src/tests/test_weakxaction.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 /* Find out about weak transactions.
  *  User A does a transaction.
  *  User B does somethign without a transaction, and it conflicts.
  */
 
 #include <assert.h>
-#include <toku_portability.h>
 #include <db.h>
 #include <stdlib.h>
 #include <memory.h>
 #include <sys/stat.h>
-#include "test.h"
 
 static void
 test_autotxn (u_int32_t env_flags, u_int32_t db_flags) {

src/tests/test_zero_length_keys.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
-#include <toku_portability.h>
 #ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+#include "test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -8,10 +8,8 @@
 #include <unistd.h>
 #include <memory.h>
 #include <sys/stat.h>
-#include <toku_portability.h>
 #include <db.h>
 
-#include "test.h"
 #ifndef ENVDIR
 #define ENVDIR "./test.dir"
 #endif