aboutsummaryrefslogtreecommitdiff
path: root/zenserver-test/zenserver-test.cpp
diff options
context:
space:
mode:
authorStefan Boberg <[email protected]>2021-08-06 18:39:13 +0200
committerStefan Boberg <[email protected]>2021-08-06 18:39:13 +0200
commitd1fdbbecaeacf751e66d2e37e191d1eaf44660f9 (patch)
tree58cd901cd0a66219d4c3e3066c6e2f64331e4efd /zenserver-test/zenserver-test.cpp
parentRepurposing test utility code to enable server control via zen (diff)
downloadzen-d1fdbbecaeacf751e66d2e37e191d1eaf44660f9.tar.xz
zen-d1fdbbecaeacf751e66d2e37e191d1eaf44660f9.zip
Added support for defining test/non-test server environments
Diffstat (limited to 'zenserver-test/zenserver-test.cpp')
-rw-r--r--zenserver-test/zenserver-test.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/zenserver-test/zenserver-test.cpp b/zenserver-test/zenserver-test.cpp
index 7a2031508..8ac486d05 100644
--- a/zenserver-test/zenserver-test.cpp
+++ b/zenserver-test/zenserver-test.cpp
@@ -658,7 +658,7 @@ main(int argc, char** argv)
std::filesystem::path ProgramBaseDir = std::filesystem::path(argv[0]).parent_path();
std::filesystem::path TestBaseDir = ProgramBaseDir.parent_path().parent_path() / ".test";
- TestEnv.Initialize(ProgramBaseDir, TestBaseDir);
+ TestEnv.InitializeForTest(ProgramBaseDir, TestBaseDir);
spdlog::info("Running tests...(base dir: '{}')", TestBaseDir);
return doctest::Context(argc, argv).run();
@@ -1325,7 +1325,7 @@ TEST_CASE("exec.basic")
Zen1.SpawnServer(PortNumber);
Zen1.WaitUntilReady();
- std::filesystem::path TreePath = TestEnv.RootDir("test/remote1");
+ std::filesystem::path TreePath = TestEnv.GetTestRootDir("test/remote1");
{
RemoteExecutionRequest RemoteRequest("localhost", PortNumber, TreePath);