diff options
| -rw-r--r-- | zencore/filesystem.cpp | 3 | ||||
| -rw-r--r-- | zenserver-test/zenserver-test.cpp | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/zencore/filesystem.cpp b/zencore/filesystem.cpp index d1b8b7aeb..e42f94550 100644 --- a/zencore/filesystem.cpp +++ b/zencore/filesystem.cpp @@ -816,7 +816,8 @@ TEST_CASE("filesystem") // GetExePath path BinPath = GetRunningExecutablePath(); - CHECK(BinPath.stem() == "zencore-test"); + const bool ExpectedExe = BinPath.stem() == "zencore-test" || BinPath.stem() == "zenserver-test"; + CHECK(ExpectedExe); CHECK(is_regular_file(BinPath)); // PathFromHandle diff --git a/zenserver-test/zenserver-test.cpp b/zenserver-test/zenserver-test.cpp index 9b5a48128..6461b76c2 100644 --- a/zenserver-test/zenserver-test.cpp +++ b/zenserver-test/zenserver-test.cpp @@ -1963,6 +1963,8 @@ TEST_CASE("exec.basic") TEST_CASE("mesh.basic") { +// --mesh option only available with ZEN_ENABLE_MESH +# if ZEN_ENABLE_MESH using namespace std::literals; const int kInstanceCount = 4; @@ -1987,6 +1989,7 @@ TEST_CASE("mesh.basic") Instance->WaitUntilReady(); } +# endif } class ZenServerTestHelper |