From 192b37fe3f37ed67646ecec016820f078c5fd35d Mon Sep 17 00:00:00 2001
From: Rich Prohaska <prohaska@tokutek.com>
Date: Tue, 16 Apr 2013 23:57:51 -0400
Subject: [PATCH] fix some more root fifo tests for bdb. closes #1721

git-svn-id: file:///svn/toku/tokudb@11488 c7de825b-a66e-492c-adef-691d508d4ae1
---
 src/tests/Makefile       |  3 +++
 src/tests/root_fifo_2.c  | 22 ++++++++++++++--------
 src/tests/root_fifo_32.c | 10 +++++-----
 src/tests/root_fifo_41.c | 10 +++++-----
 4 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/src/tests/Makefile b/src/tests/Makefile
index 23ca939a549..bcbf5a2af8b 100644
--- a/src/tests/Makefile
+++ b/src/tests/Makefile
@@ -85,6 +85,9 @@ BDB_DONTRUN_TESTS = \
 	test_db_descriptor_named_db \
 	test_heaviside_straddle_1622 \
 	test_dbremove_old \
+	root_fifo_2 \
+	root_fifo_32 \
+	root_fifo_41 \
 	checkpoint_1 \
 	checkpoint_stress \
 #\ ends prev line
diff --git a/src/tests/root_fifo_2.c b/src/tests/root_fifo_2.c
index 20765dc9c40..416347426b2 100644
--- a/src/tests/root_fifo_2.c
+++ b/src/tests/root_fifo_2.c
@@ -11,14 +11,15 @@ DBC *null_cursor = NULL;
 static void root_fifo_verify(DB_ENV *env, int n) {
     if (verbose) printf("%s:%d %d\n", __FUNCTION__, __LINE__, n);
     int r;
-    DB *db = null_db;
-    r = db_create(&db, env, 0); assert(r == 0); assert(db != NULL);
-    r = db->open(db, null_txn, "test.db", 0, DB_BTREE, DB_CREATE, S_IRWXU+S_IRWXG+S_IRWXO); 
-    assert(r == 0);
 
     DB_TXN *txn = null_txn;
     r = env->txn_begin(env, null_txn, &txn, 0); assert(r == 0); assert(txn != NULL);
 
+    DB *db = null_db;
+    r = db_create(&db, env, 0); assert(r == 0); assert(db != NULL);
+    r = db->open(db, txn, "test.db", 0, DB_BTREE, DB_CREATE, S_IRWXU+S_IRWXG+S_IRWXO); 
+    assert(r == 0);
+
     DBC *cursor = null_cursor;
     r = db->cursor(db, txn, &cursor, 0); assert(r == 0);
     int i;
@@ -41,7 +42,7 @@ static void root_fifo_verify(DB_ENV *env, int n) {
     r = db->close(db, 0); assert(r == 0); db = null_db;
 }
 
-static void root_fifo_1(int n) {
+static void root_fifo_2(int n) {
     if (verbose) printf("%s:%d %d\n", __FUNCTION__, __LINE__, n);
     int r;
 
@@ -84,7 +85,12 @@ static void root_fifo_1(int n) {
     root_fifo_verify(env, n);
 
     // cleanup
-    r = env->close(env, 0); assert(r == 0); env = null_env;
+    r = env->close(env, 0); 
+#if TOKUDB
+    assert(r == 0); env = null_env;
+#else
+    printf("%s:%d env close r=%d\n", __FUNCTION__, __LINE__, r);
+#endif
 }
 
 int test_main(int argc, char *argv[]) {
@@ -105,10 +111,10 @@ int test_main(int argc, char *argv[]) {
     }
               
     if (n >= 0)
-        root_fifo_1(n);
+        root_fifo_2(n);
     else 
         for (i=0; i<100; i++)
-            root_fifo_1(i);
+            root_fifo_2(i);
     return 0;
 }
 
diff --git a/src/tests/root_fifo_32.c b/src/tests/root_fifo_32.c
index 857ff555760..44097cb9185 100644
--- a/src/tests/root_fifo_32.c
+++ b/src/tests/root_fifo_32.c
@@ -48,14 +48,14 @@ static void root_fifo_verify(DB_ENV *env, int n) {
     if (verbose) printf("%s:%d %d\n", __FUNCTION__, __LINE__, n);
 
     int r;
-    DB *db = null_db;
-    r = db_create(&db, env, 0); assert(r == 0); assert(db != NULL);
-    r = db->open(db, null_txn, "test.db", 0, DB_BTREE, DB_CREATE, S_IRWXU+S_IRWXG+S_IRWXO); 
-    assert(r == 0);
-
     DB_TXN *txn = null_txn;
     r = env->txn_begin(env, null_txn, &txn, 0); assert(r == 0); assert(txn != NULL);
 
+    DB *db = null_db;
+    r = db_create(&db, env, 0); assert(r == 0); assert(db != NULL);
+    r = db->open(db, txn, "test.db", 0, DB_BTREE, DB_CREATE, S_IRWXU+S_IRWXG+S_IRWXO); 
+    assert(r == 0);
+
     DBC *cursor = null_cursor;
     r = db->cursor(db, txn, &cursor, 0); assert(r == 0);
     int i;
diff --git a/src/tests/root_fifo_41.c b/src/tests/root_fifo_41.c
index 0d9096279bb..d76ceb06288 100644
--- a/src/tests/root_fifo_41.c
+++ b/src/tests/root_fifo_41.c
@@ -48,14 +48,14 @@ static void root_fifo_verify(DB_ENV *env, int n, int expectn) {
     if (verbose) printf("%s:%d %d %d\n", __FUNCTION__, __LINE__, n, expectn);
 
     int r;
-    DB *db = null_db;
-    r = db_create(&db, env, 0); assert(r == 0); assert(db != NULL);
-    r = db->open(db, null_txn, "test.db", 0, DB_BTREE, DB_CREATE, S_IRWXU+S_IRWXG+S_IRWXO); 
-    assert(r == 0);
-
     DB_TXN *txn = null_txn;
     r = env->txn_begin(env, null_txn, &txn, 0); assert(r == 0); assert(txn != NULL);
 
+    DB *db = null_db;
+    r = db_create(&db, env, 0); assert(r == 0); assert(db != NULL);
+    r = db->open(db, txn, "test.db", 0, DB_BTREE, DB_CREATE, S_IRWXU+S_IRWXG+S_IRWXO); 
+    assert(r == 0);
+
     DBC *cursor = null_cursor;
     r = db->cursor(db, txn, &cursor, 0); assert(r == 0);
     int i;