aboutsummaryrefslogtreecommitdiff
path: root/zenserver-test/zenserver-test.cpp
diff options
context:
space:
mode:
authorStefan Boberg <[email protected]>2021-10-21 22:06:20 +0200
committerStefan Boberg <[email protected]>2021-10-21 22:06:20 +0200
commit05d7c8d02216174c856dcdc9f21f541d79461392 (patch)
tree93b4a84d1265ea55e06ce9974ef6f2c4e4c6ef27 /zenserver-test/zenserver-test.cpp
parentfilecas: minor code restructuring (diff)
downloadzen-05d7c8d02216174c856dcdc9f21f541d79461392.tar.xz
zen-05d7c8d02216174c856dcdc9f21f541d79461392.zip
z$: Removed CasStore
Diffstat (limited to 'zenserver-test/zenserver-test.cpp')
-rw-r--r--zenserver-test/zenserver-test.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/zenserver-test/zenserver-test.cpp b/zenserver-test/zenserver-test.cpp
index 23be9f729..41dfe8563 100644
--- a/zenserver-test/zenserver-test.cpp
+++ b/zenserver-test/zenserver-test.cpp
@@ -53,6 +53,8 @@ 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"
@@ -1880,6 +1882,8 @@ TEST_CASE("zcache.policy")
}
}
+#if ZEN_USE_EXEC
+
struct RemoteExecutionRequest
{
RemoteExecutionRequest(std::string_view Host, int Port, std::filesystem::path& TreePath)
@@ -2035,7 +2039,7 @@ TEST_CASE("exec.basic")
RemoteRequest.Prep();
zen::CbObject Result = RemoteRequest.Exec();
- CHECK(Result["exitcode"].AsInt32(-1) == 0);
+ CHECK(Result["exitcode"sv].AsInt32(-1) == 0);
}
{
@@ -2044,7 +2048,7 @@ TEST_CASE("exec.basic")
RemoteRequest.Prep();
zen::CbObject Result = RemoteRequest.Exec();
- CHECK(Result["exitcode"].AsInt32(-1) == 1);
+ CHECK(Result["exitcode"sv].AsInt32(-1) == 1);
}
}
@@ -2079,6 +2083,8 @@ TEST_CASE("mesh.basic")
# endif
}
+#endif
+
class ZenServerTestHelper
{
public: