Merge branch 'main' into traceTest

rawalexe · Oct 12, 2023 · 6a26284 · 6a26284
2 parents 5a854c0 + d357564
commit 6a26284
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/FreeRTOS/Demo/ThirdParty/Community-Supported-Demos b/FreeRTOS/Demo/ThirdParty/Community-Supported-Demos
diff --git a/FreeRTOS/Source b/FreeRTOS/Source
diff --git a/FreeRTOS/Test/CBMC/proofs/Task/TaskStartScheduler/Makefile.json b/FreeRTOS/Test/CBMC/proofs/Task/TaskStartScheduler/Makefile.json
@@ -38,7 +38,7 @@
   "CBMCFLAGS":
   [
       "--unwind 1",
-      "--unwindset prvInitialiseTaskLists.0:8,prvInitialiseNewTask.0:16,prvInitialiseNewTask.1:4"
+      "--unwindset prvInitialiseTaskLists.0:8,prvInitialiseNewTask.0:16,prvInitialiseNewTask.1:4,prvCreateIdleTasks.0:20,prvCreateIdleTasks.1:2"
   ],
   "OBJS":
   [

diff --git a/FreeRTOS/Test/CMock/tasks/FreeRTOSConfig_1.h b/FreeRTOS/Test/CMock/tasks/FreeRTOSConfig_1.h
@@ -56,6 +56,7 @@
 #define configTICK_RATE_HZ                               ( 1000 )                  /* In this non-real time simulated environment the tick frequency has to be at least a multiple of the Win32 tick frequency, and therefore very slow. */
 #define configMINIMAL_STACK_SIZE                         ( ( unsigned short ) 70 ) /* In this simulated case, the stack only has to hold one small structure as the real stack is part of the win32 thread. */
 #define configTOTAL_HEAP_SIZE                            ( ( size_t ) ( 52 * 1024 ) )
+#define configIDLE_TASK_NAME                             "IdleTaskLongerThanMax"
 #define configMAX_TASK_NAME_LEN                          ( 12 )
 #define configUSE_TRACE_FACILITY                         0
 #define configUSE_16_BIT_TICKS                           0

diff --git a/FreeRTOS/Test/CMock/tasks/tasks_1_utest.c b/FreeRTOS/Test/CMock/tasks/tasks_1_utest.c
@@ -3229,7 +3229,7 @@ void test_xTaskGetIdleTaskHandle_success( void )
     /* Api Call */
     ret_idle_handle = xTaskGetIdleTaskHandle();
     ptcb = ret_idle_handle;
-    ret = strcmp( ptcb->pcTaskName, "IDLE" );
+    ret = strncmp( ptcb->pcTaskName, configIDLE_TASK_NAME, configMAX_TASK_NAME_LEN - 1 );
     TEST_ASSERT_EQUAL( 0, ret );
 }
 

diff --git a/manifest.yml b/manifest.yml
@@ -5,7 +5,7 @@ license: "MIT"
 
 dependencies:
   - name: "FreeRTOS-Kernel"
-    version: "7372519cb"
+    version: "4bfb9b2d7"
     repository:
       type: "git"
       url: "https://github.com/FreeRTOS/FreeRTOS-Kernel.git"
@@ -131,7 +131,7 @@ dependencies:
       path: "FreeRTOS-Plus/Source/Application-Protocols/coreSNTP"
 
   - name: "FreeRTOS-Community-Supported-Demos"
-    version: "6f2ad44"
+    version: "1ba24b1"
     repository:
       type: "git"
       url: "https://github.com/FreeRTOS/FreeRTOS-Community-Supported-Demos"