Skip to content
Snippets Groups Projects
Commit 7669698d authored by Jan Trávníček's avatar Jan Trávníček
Browse files

wip #147 disable linewraps in catch2

parent dbbe8164
No related branches found
No related tags found
1 merge request!102Merge jt
......@@ -19,6 +19,13 @@
int g_Wakeup [ 2 ]; // pipe for wakeup
int g_RecvSignal; // signalled flag
 
std::string formatQueries ( const ext::vector < std::string > & queries ) {
std::string formated;
for ( const std::string & query : queries )
formated += " " + query + "\n";
return formated;
}
int waitSignalTimeout ( int timeout ) {
struct timeval tv;
fd_set rd;
......@@ -146,12 +153,12 @@ void _TimeoutAqlTest ( const std::chrono::microseconds & timeout, const ext::vec
close ( pipefd [ PIPE_WR ] );
 
if ( WIFEXITED ( status ) ) {
INFO ( "AqlTest failure. Trying to execute: " << queries );
INFO ( "AqlTest failure. Trying to execute: " << "\n" << formatQueries ( queries ) );
INFO ( "Seed was: " << seed );
INFO ( "Child output was: >" << childOutput << "<" );
REQUIRE ( WEXITSTATUS ( status ) == 0 );
} else if ( WIFSIGNALED ( status ) ) {
INFO ( "AqlTest failure. Trying to execute: " << queries );
INFO ( "AqlTest failure. Trying to execute: " << formatQueries ( queries ) );
INFO ( "Seed was: " << seed );
INFO ( "Child output was: >" << childOutput << "<" );
if ( WTERMSIG ( status ) == SIGTERM || WTERMSIG ( status ) == SIGKILL ) { /* killed by timeout control */
......
......@@ -6383,7 +6383,7 @@ class Columns;
 
class Column {
std::vector<std::string> m_strings;
size_t m_width = CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH;
size_t m_width = 1024; //CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH;
size_t m_indent = 0;
size_t m_initialIndent = std::string::npos;
 
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment