SERVER-15986 prevent server from starting up when non-active storage engine files are detected

             added storage_engine_metadata to mongo/db/storage/SConscript
             fixed cleanbb.py so that cleanup() will remove directories as well.
             fixed unix_socket1.js so that it does not store socket file in data directory

1 files changed, 3 insertions, 1 deletions

diff --git a/jstests/noPassthroughWithMongod/unix_socket1.js b/jstests/noPassthroughWithMongod/unix_socket1.js
index 0c14fc951f3..8f254e88126 100644
--- a/jstests/noPassthroughWithMongod/unix_socket1.js
+++ b/jstests/noPassthroughWithMongod/unix_socket1.js
@@ -25,8 +25,10 @@ if ( ! _isWindows() ) {
     // test unix socket path
     var ports = allocatePorts(1);
     var path = MongoRunner.dataDir + "/sockpath";
+    mkdir(path);
+    var dataPath = MongoRunner.dataDir + "/sockpath_data";
     
-    var conn = new MongodRunner(ports[0], path, null, null, ["--unixSocketPrefix", path]);
+    var conn = new MongodRunner(ports[0], dataPath, null, null, ["--unixSocketPrefix", path]);
     conn.start();
     
     var sock2 = new Mongo(path+"/mongodb-"+ports[0]+".sock");