db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-09-16 09:06:18 +02:00
Code Issues Releases Activity

Allow error buffer to be resized for testing.

Browse Source 
Some tests can generate very large error messages for diffs and they often get cut off before the end.

Also fix a test so it does not create too large a buffer on the stack.
This commit is contained in:
David Steele
2021-10-18 11:32:53 -04:00
parent 838ee3bd08
commit 4570c7e275
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/error.c
View File

@@ -88,7 +88,9 @@ situations.
The temp buffer is required because the error message being passed might be the error already stored in the message buffer. The temp buffer is required because the error message being passed might be the error already stored in the message buffer.
***********************************************************************************************************************************/ ***********************************************************************************************************************************/
#define ERROR_MESSAGE_BUFFER_SIZE 8192 #ifndef ERROR_MESSAGE_BUFFER_SIZE
#define ERROR_MESSAGE_BUFFER_SIZE 8192
#endif
static char messageBuffer[ERROR_MESSAGE_BUFFER_SIZE]; static char messageBuffer[ERROR_MESSAGE_BUFFER_SIZE];
static char messageBufferTemp[ERROR_MESSAGE_BUFFER_SIZE]; static char messageBufferTemp[ERROR_MESSAGE_BUFFER_SIZE];

1
test/lib/pgBackRestTest/Common/JobTest.pm
View File

@@ -298,6 +298,7 @@ sub run
($self->{bDebugTestTrace} && $self->{bDebug} ? " \\\n\t-DDEBUG_TEST_TRACE" : '') . ($self->{bDebugTestTrace} && $self->{bDebug} ? " \\\n\t-DDEBUG_TEST_TRACE" : '') .
(vmWithBackTrace($self->{oTest}->{&TEST_VM}) && $self->{bBackTrace} ? " \\\n\t-DWITH_BACKTRACE" : '') . (vmWithBackTrace($self->{oTest}->{&TEST_VM}) && $self->{bBackTrace} ? " \\\n\t-DWITH_BACKTRACE" : '') .
($self->{oTest}->{&TEST_CDEF} ? " \\\n\t$self->{oTest}->{&TEST_CDEF}" : '') . ($self->{oTest}->{&TEST_CDEF} ? " \\\n\t$self->{oTest}->{&TEST_CDEF}" : '') .
" -DERROR_MESSAGE_BUFFER_SIZE=131072\n" .
"\n" . "\n" .
"\n" . "\n" .
"CFLAGS_TEST =" . "CFLAGS_TEST =" .

2
test/src/module/common/errorTest.c
View File

@@ -159,7 +159,7 @@ testRun(void)
assert(errorTryDepth() == 4); assert(errorTryDepth() == 4);
tryDone = true; tryDone = true;
char bigMessage[sizeof(messageBuffer) * 32]; char bigMessage[sizeof(messageBuffer) + 128];
memset(bigMessage, 'A', sizeof(bigMessage)); memset(bigMessage, 'A', sizeof(bigMessage));
THROW(AssertError, bigMessage); THROW(AssertError, bigMessage);