From 6634844dba962b9a150646382f4d6531d1f2440b Mon Sep 17 00:00:00 2001
From: sdong <siying.d@fb.com>
Date: Tue, 1 Jul 2014 16:27:00 -0700
Subject: [PATCH] Two small fixes in db_test

Summary:
Two fixes:
(1) WalDir to pick a directory under TmpDir to allow two tests running in parallel without impacting each other
(2) kBlockBasedTableWithWholeKeyHashIndex is disabled by mistake (I assume). Enable it.

Test Plan: ./db_test

Reviewers: yhchiang, ljin

Reviewed By: ljin

Subscribers: nkg-, igor, dhruba, haobo, leveldb

Differential Revision: https://reviews.facebook.net/D19389
---
 db/db_test.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/db/db_test.cc b/db/db_test.cc
index 701c72e11..e08462bf4 100644
--- a/db/db_test.cc
+++ b/db/db_test.cc
@@ -294,8 +294,8 @@ class DBTest {
  protected:
   // Sequence of option configurations to try
   enum OptionConfig {
-    kBlockBasedTableWithWholeKeyHashIndex,
     kDefault,
+    kBlockBasedTableWithWholeKeyHashIndex,
     kBlockBasedTableWithPrefixHashIndex,
     kPlainTableFirstBytePrefix,
     kPlainTableAllBytesPrefix,
@@ -467,7 +467,7 @@ class DBTest {
         options.db_log_dir = test::TmpDir();
         break;
       case kWalDir:
-        options.wal_dir = "/tmp/wal";
+        options.wal_dir = test::TmpDir() + "/wal";
         break;
       case kManifestFileSize:
         options.max_manifest_file_size = 50; // 50 bytes