From e558fa17db4457c9f46651defac56ebd77747899 Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Fri, 9 Aug 2019 15:35:26 +0200
Subject: [PATCH] wip #147 disable linewraps in catch2
---
.../test-src/testing/TimeoutAqlTest.cpp | 11 +++++++++--
contrib/catch2/include/catch2/catch.hpp | 2 +-
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/alib2integrationtest/test-src/testing/TimeoutAqlTest.cpp b/alib2integrationtest/test-src/testing/TimeoutAqlTest.cpp
index f9e1d45bb1..9d5abef727 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 994de46af8..9ad35a265a 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;
--
GitLab