aboutsummaryrefslogtreecommitdiff
path: root/zenserver-test/zenserver-test.cpp
diff options
context:
space:
mode:
authorStefan Boberg <[email protected]>2021-09-29 22:26:07 +0200
committerStefan Boberg <[email protected]>2021-09-29 22:26:07 +0200
commit24d571fc92761d84a186a01803036720b8c5fba9 (patch)
tree2a7321fe2172e8f49d44872f078193ecf3b02bd1 /zenserver-test/zenserver-test.cpp
parentstats: added Histogram, UniformSample and SampleSnapshot (diff)
parentPrevent mesh tests to crash by moving behind define. (diff)
downloadzen-24d571fc92761d84a186a01803036720b8c5fba9.tar.xz
zen-24d571fc92761d84a186a01803036720b8c5fba9.zip
Merge branch 'main' of https://github.com/EpicGames/zen
Diffstat (limited to 'zenserver-test/zenserver-test.cpp')
-rw-r--r--zenserver-test/zenserver-test.cpp3
1 files changed, 3 insertions, 0 deletions
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