diff --git a/src/box/lua/load_cfg.lua b/src/box/lua/load_cfg.lua index 3587363ffc65ba662d502f6940a83badbb39ede9..be5c628964fd59f604eef59bc305b2c60f5958c8 100644 --- a/src/box/lua/load_cfg.lua +++ b/src/box/lua/load_cfg.lua @@ -40,7 +40,7 @@ local default_cfg = { work_dir = nil, snap_dir = ".", wal_dir = ".", - sophia_dir = './sophia', + sophia_dir = '.', sophia = default_sophia_cfg, logger = nil, logger_nonblock = true, diff --git a/test/sophia/box.lua b/test/sophia/box.lua index de85f237bdc1b686dbebc761e6de0b4d8e585c05..b749472be3851743d3f4f09c51072b050ce5c6f5 100644 --- a/test/sophia/box.lua +++ b/test/sophia/box.lua @@ -8,6 +8,10 @@ function sophia_printdir() return ls end +function sophia_mkdir(dir) + os.execute("mkdir sophia_test") +end + function sophia_rmdir(dir) os.execute("rm -rf sophia_test") end @@ -24,6 +28,7 @@ end if not file_exists("lock") then sophia_rmdir() + sophia_mkdir() end local sophia = { @@ -38,7 +43,7 @@ box.cfg { slab_alloc_arena = 0.1, pid_file = "tarantool.pid", rows_per_wal = 50, - sophia_dir = "sophia_test", + sophia_dir = "./sophia_test", sophia = sophia } diff --git a/third_party/sophia b/third_party/sophia index 4a9b77cbad39976ec40efaa0cb2e66bdaf810d41..173534aea02a6ef14e4fc7f517d0123da3be6301 160000 --- a/third_party/sophia +++ b/third_party/sophia @@ -1 +1 @@ -Subproject commit 4a9b77cbad39976ec40efaa0cb2e66bdaf810d41 +Subproject commit 173534aea02a6ef14e4fc7f517d0123da3be6301