X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fserver_container.cc;h=3c84ad85c339b9e9a7ddfb5021503df1effe2713;hb=ad5d3efae1a492151ab2b08d370d86d27931c3a9;hp=2c31796f3e141c64530df63aabf99b253725e862;hpb=751e342e158ae65052ce098ccd64aa54e39312db;p=m6w6%2Flibmemcached diff --git a/libtest/server_container.cc b/libtest/server_container.cc index 2c31796f..3c84ad85 100644 --- a/libtest/server_container.cc +++ b/libtest/server_container.cc @@ -146,23 +146,6 @@ bool server_startup(server_startup_st& construct, const std::string& server_type Outn(); (void)try_port; - set_max_port(try_port); - - // Look to see if we are being provided ports to use - { - char variable_buffer[1024]; - snprintf(variable_buffer, sizeof(variable_buffer), "LIBTEST_PORT_%lu", (unsigned long)construct.count()); - - char *var; - if ((var= getenv(variable_buffer))) - { - in_port_t tmp= in_port_t(atoi(var)); - - if (tmp > 0) - try_port= tmp; - } - } - libtest::Server *server= NULL; if (0) { } @@ -233,7 +216,9 @@ bool server_startup(server_startup_st& construct, const std::string& server_type Out << "Pausing for startup, hit return when ready."; std::string gdb_command= server->base_command(); std::string options; +#if 0 Out << "run " << server->args(options); +#endif getchar(); } else if (server->start() == false) @@ -249,12 +234,6 @@ bool server_startup(server_startup_st& construct, const std::string& server_type construct.push_server(server); - if (default_port() == 0) - { - assert(server->has_port()); - set_default_port(server->port()); - } - Outn(); return true; @@ -336,7 +315,9 @@ bool server_startup_st::start_socket_server(const std::string& server_type, cons Out << "Pausing for startup, hit return when ready."; std::string gdb_command= server->base_command(); std::string options; +#if 0 Out << "run " << server->args(options); +#endif getchar(); } else if (not server->start())