RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

validation: Fix for 64-bit targets

Browse Source 
Closes #4179.
This commit is contained in:
Sebastian Huber
2021-03-03 10:27:52 +01:00
parent 30f6fd5b3f
commit 8fe59be236
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spec/build/bsps/aarch64/a53/tsta53.yml
View File

@@ -4,9 +4,6 @@ actions:
# expected to fail, don't compile these # expected to fail, don't compile these
minimum: exclude minimum: exclude
# test broken under 64bit due to SIZE_MAX differences
validation-0: exclude
# don't compile due to toolchain issues # don't compile due to toolchain issues
spconfig01: exclude spconfig01: exclude
spmisc01: exclude spmisc01: exclude

3
spec/build/bsps/aarch64/xilinx-zynqmp/tstqemu.yml
View File

@@ -4,9 +4,6 @@ actions:
# expected to fail # expected to fail
minimum: exclude minimum: exclude
# test broken under 64bit due to SIZE_MAX differences
validation-0: expected-fail
# don't compile due to toolchain issues # don't compile due to toolchain issues
spconfig01: exclude spconfig01: exclude
spmisc01: exclude spmisc01: exclude

13
testsuites/validation/tc-message-construct-errors.c
View File

@@ -358,7 +358,18 @@ static void RtemsMessageReqConstructErrors_Pre_MaxSize_Prepare(
* The maximum message size of the message queue configuration shall be * The maximum message size of the message queue configuration shall be
* valid. * valid.
*/ */
ctx->config.maximum_message_size = MAX_MESSAGE_SIZE; if ( ctx->config.maximum_pending_messages == UINT32_MAX ) {
/*
* At least on 64-bit systems we need a bit of help to ensure that we
* meet the Big state of the MaxPending pre-condition. The following
* message size is valid with respect to calculations involving only
* the message size.
*/
ctx->config.maximum_message_size = SIZE_MAX - sizeof( uintptr_t ) +
1 - sizeof( CORE_message_queue_Buffer );
} else {
ctx->config.maximum_message_size = MAX_MESSAGE_SIZE;
}
break; break;
} }