*/
+#include <config.h>
#include <libtest/common.h>
#include <cassert>
output << " Socket:" << arg.socket();
}
- if (not arg.running().empty())
+ if (arg.running().empty() == false)
{
output << " Exec:" << arg.running();
}
return output; // for multiple << operators
}
+#define MAGIC_MEMORY 123570
+
Server::Server(const std::string& host_arg, const in_port_t port_arg, bool is_socket_arg) :
+ _magic(MAGIC_MEMORY),
_is_socket(is_socket_arg),
_pid(-1),
_port(port_arg),
}
}
+bool Server::validate()
+{
+ return _magic == MAGIC_MEMORY;
+}
+
// If the server exists, kill it
bool Server::cycle()
{
// Try to ping, and kill the server #limit number of times
pid_t current_pid;
- while (--limit and is_pid_valid(current_pid= get_pid()))
+ while (--limit and
+ is_pid_valid(current_pid= get_pid()))
{
if (kill(current_pid))
{
}
Application app(executable(), is_libtool());
+
+ if (is_debug())
+ {
+ app.use_gdb();
+ }
+ else if (getenv("TESTS_ENVIRONMENT"))
+ {
+ if (strstr(getenv("TESTS_ENVIRONMENT"), "gdb"))
+ {
+ app.use_gdb();
+ }
+ }
+
if (args(app) == false)
{
Error << "Could not build command()";
if (Application::SUCCESS != (ret= app.wait()))
{
- Error << "Application::wait() " << app.print() << " " << ret;
+ Error << "Application::wait() " << _running << " " << ret;
return false;
}
{
Wait wait(pid_file(), 8);
- if (not wait.successful())
+ if (wait.successful() == false)
{
- Error << "Unable to open pidfile for: " << _running;
+ libtest::fatal(LIBYATL_DEFAULT_PARAM,
+ "Unable to open pidfile for: %s",
+ _running.c_str());
}
}
// If we happen to have a pid file, lets try to kill it
if (pid_file().empty() == false)
{
- Error << "We are going to kill it off";
- kill_file(pid_file());
+ if (kill_file(pid_file()) == false)
+ {
+ fatal_message("Failed to kill off server after startup occurred, when pinging failed");
+ }
+ Error << "Failed to ping() server started, having pid_file. exec:" << _running;
+ }
+ else
+ {
+ Error << "Failed to ping() server started. exec:" << _running;
}
- Error << "Failed to ping() server started with:" << _running;
_running.clear();
return false;
}
int fd;
if ((fd= mkstemp(file_buffer)) == -1)
{
- perror(file_buffer);
- return false;
+ libtest::fatal(LIBYATL_DEFAULT_PARAM, "mkstemp() failed on %s with %s", file_buffer, strerror(errno));
}
close(fd);
{
// Set a log file if it was requested (and we can)
- if (getenv("LIBTEST_LOG") and has_log_file_option())
+ if (has_log_file_option())
{
- if (not set_log_file())
- {
- return false;
- }
-
+ set_log_file();
log_file_option(app, _log_file);
}
if (has_socket_file_option())
{
- Error << "adding socket option ";
if (set_socket_file() == false)
{
return false;