Make {{{test_set_lk_max_locks}}} run again. Refs #2952. [t:2952]

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

src/tests/test_set_lk_max_locks.c

@@ -15,6 +15,12 @@
 
 // ENVDIR is defined in the Makefile
 
+#ifdef TOKUDB
+#define EXTRA_LOCK_NEEDED 2
+#else
+#define EXTRA_LOCK_NEEDED 0
+#endif
+
 static void make_db (int n_locks) {
     DB_ENV *env;
     DB *db;
@@ -26,10 +32,12 @@ static void make_db (int n_locks) {
     CKERR(r);
     r=toku_os_mkdir(ENVDIR, S_IRWXU+S_IRWXG+S_IRWXO);       assert(r==0);
     r=db_env_create(&env, 0); assert(r==0);
+#ifdef TOKUDB
     r = env->set_redzone(env, 0); assert(r == 0);
+#endif
     env->set_errfile(env, 0);
     if (n_locks>0) {
-	r=env->set_lk_max_locks(env, n_locks+2); CKERR(r);
+	r=env->set_lk_max_locks(env, n_locks+EXTRA_LOCK_NEEDED); CKERR(r);
         /* test the get_lk_max_locks method */
         u_int32_t set_locks;
 #ifdef TOKUDB
@@ -38,7 +46,7 @@ static void make_db (int n_locks) {
         assert(r == EINVAL);
 #endif
         r=env->get_lk_max_locks(env, &set_locks);
-        assert(r == 0 && set_locks == (u_int32_t)n_locks+2);
+        assert(r == 0 && set_locks == (u_int32_t)n_locks+EXTRA_LOCK_NEEDED);
     }
     r=env->open(env, ENVDIR, DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_MPOOL|DB_INIT_TXN|DB_CREATE|DB_PRIVATE, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r);
     r=db_create(&db, env, 0); CKERR(r);
@@ -53,7 +61,7 @@ static void make_db (int n_locks) {
 #else
     u_int32_t datasize = 1;
 #endif
-    int effective_n_locks = (n_locks<0) ? 998 : n_locks;
+    int effective_n_locks = (n_locks<0) ? 1000-EXTRA_LOCK_NEEDED : n_locks;
     // create even numbered keys 0 2 4 ...  (effective_n_locks*32-2)
     
     r=env->txn_begin(env, 0, &tid, 0);    CKERR(r);