summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorjsmall-nvidia <jsmall@nvidia.com>2021-12-07 12:26:48 -0500
committerGitHub <noreply@github.com>2021-12-07 12:26:48 -0500
commit9e666a332aafeffdc15ceab6017fe377144a928b (patch)
tree4d5a27b5286cb95757ad45f097f4acf74dfb2159 /tools
parentef4ee0b2d42b1fe9ce36c67526cf853343d98ea0 (diff)
Support array args for JSON-RPC (#2046)
* #include an absolute path didn't work - because paths were taken to always be relative. * Add ability to send/receive JSON-RPC params optionally as an array. * More array conversions to json-native. * Simplified setting up of 'CallStyle' on JSONRPCConnection. * Small simplification in JSONRPCConnection. * Small improvements around JSON-RPC connection. * Improve some comments. Kick CI build.
Diffstat (limited to 'tools')
-rw-r--r--tools/slang-test/test-context.cpp2
-rw-r--r--tools/test-server/test-server-main.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/slang-test/test-context.cpp b/tools/slang-test/test-context.cpp
index 2f0e23815..d5af41a78 100644
--- a/tools/slang-test/test-context.cpp
+++ b/tools/slang-test/test-context.cpp
@@ -128,7 +128,7 @@ SlangResult TestContext::_createJSONRPCConnection(RefPtr<JSONRPCConnection>& out
RefPtr<HTTPPacketConnection> connection = new HTTPPacketConnection(readStream, writeStream);
RefPtr<JSONRPCConnection> rpcConnection = new JSONRPCConnection;
- SLANG_RETURN_ON_FAIL(rpcConnection->init(connection, process));
+ SLANG_RETURN_ON_FAIL(rpcConnection->init(connection, JSONRPCConnection::CallStyle::Default, process));
out = rpcConnection;
diff --git a/tools/test-server/test-server-main.cpp b/tools/test-server/test-server-main.cpp
index a32d8c542..b4eead664 100644
--- a/tools/test-server/test-server-main.cpp
+++ b/tools/test-server/test-server-main.cpp
@@ -371,7 +371,7 @@ SlangResult TestServer::_executeUnitTest(const JSONRPCCall& call)
auto id = m_connection->getPersistentValue(call.id);
TestServerProtocol::ExecuteUnitTestArgs args;
- SLANG_RETURN_ON_FAIL(m_connection->toNativeOrSendError(call.params, &args, call.id));
+ SLANG_RETURN_ON_FAIL(m_connection->toNativeArgsOrSendError(call.params, &args, call.id));
auto sink = m_connection->getSink();
@@ -443,7 +443,7 @@ SlangResult TestServer::_executeTool(const JSONRPCCall& call)
TestServerProtocol::ExecuteToolTestArgs args;
- SLANG_RETURN_ON_FAIL(m_connection->toNativeOrSendError(call.params, &args, id));
+ SLANG_RETURN_ON_FAIL(m_connection->toNativeArgsOrSendError(call.params, &args, id));
auto sink = m_connection->getSink();