is_massive(opt_massive);
}
- char buffer[1024];
+ char tmp_directory[1024];
if (getenv("LIBTEST_TMP"))
{
- snprintf(buffer, sizeof(buffer), "%s", getenv("LIBTEST_TMP"));
+ snprintf(tmp_directory, sizeof(tmp_directory), "%s", getenv("LIBTEST_TMP"));
}
else
{
- snprintf(buffer, sizeof(buffer), "%s", LIBTEST_TEMP);
+ snprintf(tmp_directory, sizeof(tmp_directory), "%s", LIBTEST_TEMP);
}
- if (chdir(buffer) == -1)
+ if (chdir(tmp_directory) == -1)
{
char getcwd_buffer[1024];
char *dir= getcwd(getcwd_buffer, sizeof(getcwd_buffer));
- Error << "Unable to chdir() from " << dir << " to " << buffer << " errno:" << strerror(errno);
+ Error << "Unable to chdir() from " << dir << " to " << tmp_directory << " errno:" << strerror(errno);
return EXIT_FAILURE;
}
return EXIT_SKIP;
case TEST_FAILURE:
- std::cerr << "frame->create()" << std::endl;
+ std::cerr << __FILE__ << ":" << __LINE__ << ": " << "frame->create()" << std::endl;
return EXIT_FAILURE;
}
}
std::ofstream xml_file;
std::string file_name;
- if (getenv("LIBTEST_TEMP"))
- {
- file_name.append(getenv("LIBTEST_TEMP"));
- }
+ file_name.append(tmp_directory);
file_name.append(frame->name());
file_name.append(".xml");
xml_file.open(file_name.c_str(), std::ios::trunc);
}
catch (libtest::fatal& e)
{
- std::cerr << "FATAL:" << e.what() << std::endl;
- exit_code= EXIT_FAILURE;
- }
- catch (libtest::start& e)
- {
- std::cerr << "Failure to start:" << e.what() << std::endl;
+ std::cerr << __FILE__ << ":" << __LINE__ << ": " << "FATAL:" << e.what() << std::endl;
exit_code= EXIT_FAILURE;
}
catch (libtest::disconnected& e)
{
- std::cerr << "Unhandled disconnection occurred:" << e.what() << std::endl;
+ std::cerr << __FILE__ << ":" << __LINE__ << ": " << "Unhandled disconnection occurred:" << e.what() << std::endl;
exit_code= EXIT_FAILURE;
}
catch (std::exception& e)
{
- std::cerr << "std::exception:" << e.what() << std::endl;
+ std::cerr << __FILE__ << ":" << __LINE__ << ": " << "std::exception:" << e.what() << std::endl;
exit_code= EXIT_FAILURE;
}
catch (char const*)
{
- std::cerr << "Exception:" << std::endl;
+ std::cerr << __FILE__ << ":" << __LINE__ << ": " << "Exception:" << std::endl;
exit_code= EXIT_FAILURE;
}
catch (...)
{
- std::cerr << "Unknown exception halted execution." << std::endl;
+ std::cerr << __FILE__ << ":" << __LINE__ << ": " << "Unknown exception halted execution." << std::endl;
exit_code= EXIT_FAILURE;
}