From a7e0785ae8885e769dae4f50c7e16ca1e929cf17 Mon Sep 17 00:00:00 2001
From: Sulverus <sulverus@gmail.com>
Date: Mon, 8 Jun 2015 21:26:40 +0300
Subject: [PATCH] ctl config updated, test-run updated
---
test-run | 2 +-
test/.tarantoolctl | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/test-run b/test-run
index 9c05fb7c36..7a9dffa16d 160000
--- a/test-run
+++ b/test-run
@@ -1 +1 @@
-Subproject commit 9c05fb7c36dfe11b5dd2f8ab2293d1be521b8ced
+Subproject commit 7a9dffa16d0da05ec33fe0b131e92f6d86a87fd6
diff --git a/test/.tarantoolctl b/test/.tarantoolctl
index 78d5da271f..94bb001839 100644
--- a/test/.tarantoolctl
+++ b/test/.tarantoolctl
@@ -1,15 +1,15 @@
-- Options for test-run tarantoolctl
-local pwd = os.getenv('PWD')
+local workdir = os.getenv('TEST_WORKDIR')
default_cfg = {
- pid_file = pwd .. "/var",
- wal_dir = pwd .. "/var",
- snap_dir = pwd .. "/var",
- sophia_dir = pwd .. "/var",
- logger = pwd .. "/var",
+ pid_file = workdir,
+ wal_dir = workdir,
+ snap_dir = workdir,
+ sophia_dir = workdir,
+ logger = workdir,
background = false,
}
-instance_dir = pwd .. "/var"
+instance_dir = workdir
-- vim: set ft=lua :
--
GitLab