diff options
author | Jens Geyer <jensg@apache.org> | 2019-11-23 18:50:22 +0100 |
---|---|---|
committer | Jens Geyer <jensg@apache.org> | 2019-11-23 22:33:29 +0100 |
commit | b541c6f2b126219867963c8b577b4c08d72e866d (patch) | |
tree | 3dddb1ed7ee7df3798e82b0ebf050494786751ea /test/netstd | |
parent | 9d958a3caf5c82b25a00b0b6cd4ab431bc1fed18 (diff) | |
download | thrift-b541c6f2b126219867963c8b577b4c08d72e866d.tar.gz |
THRIFT-5026 TestClient/Server ignores first cmdline argument
Client: netstd
Patch: Jens Geyer
This closes #1945
Diffstat (limited to 'test/netstd')
-rw-r--r-- | test/netstd/Client/Program.cs | 16 | ||||
-rw-r--r-- | test/netstd/Server/Program.cs | 16 |
2 files changed, 8 insertions, 24 deletions
diff --git a/test/netstd/Client/Program.cs b/test/netstd/Client/Program.cs index 8dbff1a23..47dabd3c9 100644 --- a/test/netstd/Client/Program.cs +++ b/test/netstd/Client/Program.cs @@ -34,17 +34,9 @@ namespace Client Console.WriteLine("Failed to grow scroll-back buffer"); } - // split mode and options - var subArgs = new List<string>(args); - var firstArg = string.Empty; - if (subArgs.Count > 0) - { - firstArg = subArgs[0]; - subArgs.RemoveAt(0); - } - - // run whatever mode is choosen - switch(firstArg) + // run whatever mode is choosen, default to test impl + var firstArg = args.Length > 0 ? args[0] : string.Empty; + switch (firstArg) { case "client": Console.WriteLine("The 'client' argument is no longer required."); @@ -56,7 +48,7 @@ namespace Client PrintHelp(); return 0; default: - return TestClient.Execute(subArgs); + return TestClient.Execute(new List<string>(args)); } } diff --git a/test/netstd/Server/Program.cs b/test/netstd/Server/Program.cs index 4525ab75c..1b8ffd46a 100644 --- a/test/netstd/Server/Program.cs +++ b/test/netstd/Server/Program.cs @@ -34,17 +34,9 @@ namespace Server Console.WriteLine("Failed to grow scroll-back buffer"); } - // split mode and options - var subArgs = new List<string>(args); - var firstArg = string.Empty; - if (subArgs.Count > 0) - { - firstArg = subArgs[0]; - subArgs.RemoveAt(0); - } - - // run whatever mode is choosen - switch(firstArg) + // run whatever mode is choosen, default to test impl + var firstArg = args.Length > 0 ? args[0] : string.Empty; + switch (firstArg) { case "server": Console.WriteLine("The 'server' argument is no longer required."); @@ -54,7 +46,7 @@ namespace Server PrintHelp(); return 0; default: - return TestServer.Execute(subArgs); + return TestServer.Execute(new List<string>( args)); } } |