THRIFT-5145 Streamline --pipe and --named-pipe options in the code base
Client: Test suite
Patch: Jens Geyer
This closes #2065
diff --git a/lib/delphi/test/TestClient.pas b/lib/delphi/test/TestClient.pas
index 1579bd5..ff59982 100644
--- a/lib/delphi/test/TestClient.pas
+++ b/lib/delphi/test/TestClient.pas
@@ -196,7 +196,7 @@
+ ' --port arg (=9090) Port number to connect'#10
+ ' --domain-socket arg Domain Socket (e.g. /tmp/ThriftTest.thrift),'#10
+ ' instead of host and port'#10
- + ' --named-pipe arg Windows Named Pipe (e.g. MyThriftPipe)'#10
+ + ' --pipe arg Windows Named Pipe (e.g. MyThriftPipe)'#10
+ ' --anon-pipes hRead hWrite Windows Anonymous Pipes pair (handles)'#10
+ ' --transport arg (=sockets) Transport: buffered, framed, http, winhttp'#10
+ ' --protocol arg (=binary) Protocol: binary, compact, json'#10
@@ -268,8 +268,8 @@
// --domain-socket arg Domain Socket (e.g. /tmp/ThriftTest.thrift), instead of host and port
raise Exception.Create('domain-socket not supported');
end
- else if s = '--named-pipe' then begin
- // --named-pipe arg Windows Named Pipe (e.g. MyThriftPipe)
+ else if s = '--pipe' then begin
+ // --pipe arg Windows Named Pipe (e.g. MyThriftPipe)
setup.endpoint := trns_NamedPipes;
setup.sPipeName := args[i];
Inc( i);
diff --git a/lib/delphi/test/TestServer.pas b/lib/delphi/test/TestServer.pas
index bbc798b..f93c846 100644
--- a/lib/delphi/test/TestServer.pas
+++ b/lib/delphi/test/TestServer.pas
@@ -388,7 +388,7 @@
+ ' -h [ --help ] produce help message'#10
+ ' --port arg (=9090) Port number to listen'#10
+ ' --domain-socket arg Unix Domain Socket (e.g. /tmp/ThriftTest.thrift)'#10
- + ' --named-pipe arg Windows Named Pipe (e.g. MyThriftPipe)'#10
+ + ' --pipe arg Windows Named Pipe (e.g. MyThriftPipe)'#10
+ ' --server-type arg (=simple) type of server, "simple", "thread-pool",'#10
+ ' "threaded", or "nonblocking"'#10
+ ' --transport arg (=socket) transport: buffered, framed, http, anonpipe'#10
@@ -503,10 +503,10 @@
// --domain-socket arg Unix Domain Socket (e.g. /tmp/ThriftTest.thrift)
raise Exception.Create('domain-socket not supported');
end
- else if (s = '--named-pipe') then begin
- // --named-pipe arg Windows Named Pipe (e.g. MyThriftPipe)
+ else if (s = '--pipe') then begin
+ // --pipe arg Windows Named Pipe (e.g. MyThriftPipe)
endpoint := trns_NamedPipes;
- sPipeName := args[i]; // -pipe <name>
+ sPipeName := args[i]; // --pipe <name>
Inc( i );
end
else if (s = '--server-type') then begin