diff --git a/alib2integrationtest/test-src/testing/TimeoutAqlTest.cpp b/alib2integrationtest/test-src/testing/TimeoutAqlTest.cpp index f9e1d45bb1f527702ca101fcc6da643b94734a5b..9d5abef727bbab3ce06c6aaba9d459d495058e6d 100644 --- a/alib2integrationtest/test-src/testing/TimeoutAqlTest.cpp +++ b/alib2integrationtest/test-src/testing/TimeoutAqlTest.cpp @@ -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 */ diff --git a/contrib/catch2/include/catch2/catch.hpp b/contrib/catch2/include/catch2/catch.hpp index 994de46af878e69bb87127b0489182213f98e230..9ad35a265a2c6bea8ba1e4b41e34653de43d704b 100644 --- a/contrib/catch2/include/catch2/catch.hpp +++ b/contrib/catch2/include/catch2/catch.hpp @@ -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;