Changeset 8fe59be in rtems

Timestamp:

Mar 3, 2021, 9:27:52 AM (7 weeks ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

master

Children:

1de00d6

Parents:

30f6fd5b

git-author:

Sebastian Huber <sebastian.huber@…> (03/03/21 09:27:52)

git-committer:

Sebastian Huber <sebastian.huber@…> (03/04/21 08:08:03)

Message:

validation: Fix for 64-bit targets

Closes #4179.

Files:

• spec/build/bsps/aarch64/a53/tsta53.yml (modified) (1 diff)
• spec/build/bsps/aarch64/xilinx-zynqmp/tstqemu.yml (modified) (1 diff)
• testsuites/validation/tc-message-construct-errors.c (modified) (1 diff)

spec/build/bsps/aarch64/a53/tsta53.yml

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

spec/build/bsps/aarch64/xilinx-zynqmp/tstqemu.yml

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

testsuites/validation/tc-message-construct-errors.c

@@ -359 +359 @@
        * 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;
     }