From d1fdbbecaeacf751e66d2e37e191d1eaf44660f9 Mon Sep 17 00:00:00 2001 From: Stefan Boberg Date: Fri, 6 Aug 2021 18:39:13 +0200 Subject: Added support for defining test/non-test server environments --- zenserver-test/zenserver-test.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'zenserver-test/zenserver-test.cpp') 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); -- cgit v1.2.3