aboutsummaryrefslogtreecommitdiff
path: root/zenserver-test/zenserver-test.cpp
diff options
context:
space:
mode:
authorJoe Kirchoff <[email protected]>2022-03-22 11:47:38 -0700
committerGitHub <[email protected]>2022-03-22 11:47:38 -0700
commitcc5adf4cb79c92993fabfe09e75dfadb7d4c9665 (patch)
tree4ba0a18f68e39685fa784d872bbb4bb9ba2b6fd7 /zenserver-test/zenserver-test.cpp
parentmove workthreadpool to zencore (#63) (diff)
downloadzen-cc5adf4cb79c92993fabfe09e75dfadb7d4c9665.tar.xz
zen-cc5adf4cb79c92993fabfe09e75dfadb7d4c9665.zip
Enable Horde compute code on Linux & Mac (#61)
Diffstat (limited to 'zenserver-test/zenserver-test.cpp')
-rw-r--r--zenserver-test/zenserver-test.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/zenserver-test/zenserver-test.cpp b/zenserver-test/zenserver-test.cpp
index 16f47cd84..a0d97a489 100644
--- a/zenserver-test/zenserver-test.cpp
+++ b/zenserver-test/zenserver-test.cpp
@@ -58,8 +58,6 @@ ZEN_THIRD_PARTY_INCLUDES_END
#include <asio.hpp>
-#define ZEN_USE_EXEC 0 // Note: this should really be a global define to match the zenserver definition
-
//////////////////////////////////////////////////////////////////////////
#include "projectclient.h"
@@ -2355,7 +2353,7 @@ TEST_CASE("zcache.rpc.allpolicies")
}
}
-# if ZEN_USE_EXEC
+# if ZEN_WITH_EXEC_SERVICES
struct RemoteExecutionRequest
{
@@ -2494,7 +2492,7 @@ private:
TEST_CASE("exec.basic")
{
-# if ZEN_WITH_COMPUTE_SERVICES
+# if ZEN_WITH_EXEC_SERVICES
using namespace std::literals;
std::filesystem::path TestDir = TestEnv.CreateNewTestDir();
@@ -2525,7 +2523,7 @@ TEST_CASE("exec.basic")
CHECK(Result["exitcode"sv].AsInt32(-1) == 1);
}
-# endif // ZEN_WITH_COMPUTE_SERVICES
+# endif // ZEN_WITH_EXEC_SERVICES
}
TEST_CASE("mesh.basic")
@@ -2559,7 +2557,7 @@ TEST_CASE("mesh.basic")
# endif
}
-# endif
+# endif // ZEN_WITH_EXEC_SERVICES
class ZenServerTestHelper
{