From dad8b50876252744f2dbf7c478c16d2a5f69192a Mon Sep 17 00:00:00 2001
From: Zim Kalinowski <zim.kalinowski@zoho.com>
Date: Wed, 20 Apr 2022 13:31:49 +0200
Subject: [PATCH] freertos: move test files to appropriate subfolders

---
 components/freertos/test/CMakeLists.txt                  | 9 ++++++++-
 .../event_groups}/test_freertos_eventgroups.c            | 1 +
 .../queue}/test_freertos_debug_functions.c               | 6 ++++++
 .../test/{ => integration/queue}/test_queuesets.c        | 6 ++++++
 .../stream_buffer}/test_stream_buffers.c                 | 6 ++++++
 .../{ => integration/tasks}/test_freertos_get_state.c    | 1 +
 .../tasks}/test_freertos_scheduling_round_robin.c        | 2 +-
 .../tasks}/test_freertos_task_delay_until.c              | 6 ++++++
 .../{ => integration/tasks}/test_freertos_task_delete.c  | 6 ++++++
 .../{ => integration/tasks}/test_freertos_task_notify.c  | 1 +
 .../tasks}/test_freertos_task_utilities.c                | 3 ++-
 .../{ => integration/tasks}/test_suspend_scheduler.c     | 1 +
 .../test/{ => integration/tasks}/test_task_priorities.c  | 6 ++++++
 .../{ => integration/tasks}/test_task_suspend_resume.c   | 1 +
 .../test/{ => integration/tasks}/test_tasks_snapshot.c   | 0
 .../freertos/test/{ => integration/timers}/test_timers.c | 6 ++++++
 .../test_freertos_backported_functions.c                 | 6 ++++++
 .../test/{ => miscellaneous}/test_freertos_mutex.c       | 6 ++++++
 .../{ => miscellaneous}/test_freertos_trace_utilities.c  | 6 ++++++
 .../freertos/test/{ => miscellaneous}/test_panic.c       | 6 ++++++
 .../freertos/test/{ => miscellaneous}/test_preemption.c  | 1 +
 .../{ => performance}/test_freertos_scheduling_time.c    | 6 ++++++
 .../freertos/test/{ => performance}/test_isr_latency.c   | 6 ++++++
 .../freertos/test/{ => port}/test_context_save_clobber.S | 6 ++++++
 .../freertos/test/{ => port}/test_context_save_clobber.c | 6 ++++++
 components/freertos/test/{ => port}/test_float_in_isr.c  | 6 ++++++
 .../freertos/test/{ => port}/test_freertos_hooks.c       | 0
 .../test/{ => port}/test_freertos_isinisrcontext.c       | 6 ++++++
 components/freertos/test/{ => port}/test_newlib_reent.c  | 6 ++++++
 components/freertos/test/{ => port}/test_spinlocks.c     | 1 +
 components/freertos/test/{ => port}/test_thread_local.c  | 6 ++++++
 .../test/{ => port}/test_xtensa_loadstore_handler.c      | 0
 32 files changed, 132 insertions(+), 3 deletions(-)
 rename components/freertos/test/{ => integration/event_groups}/test_freertos_eventgroups.c (99%)
 rename components/freertos/test/{ => integration/queue}/test_freertos_debug_functions.c (96%)
 rename components/freertos/test/{ => integration/queue}/test_queuesets.c (97%)
 rename components/freertos/test/{ => integration/stream_buffer}/test_stream_buffers.c (95%)
 rename components/freertos/test/{ => integration/tasks}/test_freertos_get_state.c (99%)
 rename components/freertos/test/{ => integration/tasks}/test_freertos_scheduling_round_robin.c (98%)
 rename components/freertos/test/{ => integration/tasks}/test_freertos_task_delay_until.c (95%)
 rename components/freertos/test/{ => integration/tasks}/test_freertos_task_delete.c (98%)
 rename components/freertos/test/{ => integration/tasks}/test_freertos_task_notify.c (99%)
 rename components/freertos/test/{ => integration/tasks}/test_freertos_task_utilities.c (97%)
 rename components/freertos/test/{ => integration/tasks}/test_suspend_scheduler.c (99%)
 rename components/freertos/test/{ => integration/tasks}/test_task_priorities.c (95%)
 rename components/freertos/test/{ => integration/tasks}/test_task_suspend_resume.c (99%)
 rename components/freertos/test/{ => integration/tasks}/test_tasks_snapshot.c (100%)
 rename components/freertos/test/{ => integration/timers}/test_timers.c (95%)
 rename components/freertos/test/{ => miscellaneous}/test_freertos_backported_functions.c (98%)
 rename components/freertos/test/{ => miscellaneous}/test_freertos_mutex.c (87%)
 rename components/freertos/test/{ => miscellaneous}/test_freertos_trace_utilities.c (97%)
 rename components/freertos/test/{ => miscellaneous}/test_panic.c (76%)
 rename components/freertos/test/{ => miscellaneous}/test_preemption.c (99%)
 rename components/freertos/test/{ => performance}/test_freertos_scheduling_time.c (94%)
 rename components/freertos/test/{ => performance}/test_isr_latency.c (97%)
 rename components/freertos/test/{ => port}/test_context_save_clobber.S (91%)
 rename components/freertos/test/{ => port}/test_context_save_clobber.c (92%)
 rename components/freertos/test/{ => port}/test_float_in_isr.c (92%)
 rename components/freertos/test/{ => port}/test_freertos_hooks.c (100%)
 rename components/freertos/test/{ => port}/test_freertos_isinisrcontext.c (91%)
 rename components/freertos/test/{ => port}/test_newlib_reent.c (92%)
 rename components/freertos/test/{ => port}/test_spinlocks.c (99%)
 rename components/freertos/test/{ => port}/test_thread_local.c (97%)
 rename components/freertos/test/{ => port}/test_xtensa_loadstore_handler.c (100%)

diff --git a/components/freertos/test/CMakeLists.txt b/components/freertos/test/CMakeLists.txt
index 00b876bf1c..63eaf7476d 100644
--- a/components/freertos/test/CMakeLists.txt
+++ b/components/freertos/test/CMakeLists.txt
@@ -1,3 +1,10 @@
-idf_component_register(SRC_DIRS .
+idf_component_register(SRC_DIRS integration/event_groups
+                                integration/queue
+                                integration/stream_buffer
+                                integration/tasks
+                                integration/timers
+                                miscellaneous
+                                performance
+                                port
                        PRIV_INCLUDE_DIRS .
                        PRIV_REQUIRES cmock test_utils esp_system driver)
diff --git a/components/freertos/test/test_freertos_eventgroups.c b/components/freertos/test/integration/event_groups/test_freertos_eventgroups.c
similarity index 99%
rename from components/freertos/test/test_freertos_eventgroups.c
rename to components/freertos/test/integration/event_groups/test_freertos_eventgroups.c
index 36211082ba..7de087488b 100644
--- a/components/freertos/test/test_freertos_eventgroups.c
+++ b/components/freertos/test/integration/event_groups/test_freertos_eventgroups.c
@@ -3,6 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+
 #include <stdio.h>
 
 #include "freertos/FreeRTOS.h"
diff --git a/components/freertos/test/test_freertos_debug_functions.c b/components/freertos/test/integration/queue/test_freertos_debug_functions.c
similarity index 96%
rename from components/freertos/test/test_freertos_debug_functions.c
rename to components/freertos/test/integration/queue/test_freertos_debug_functions.c
index bd7b820bcc..491f035aa5 100644
--- a/components/freertos/test/test_freertos_debug_functions.c
+++ b/components/freertos/test/integration/queue/test_freertos_debug_functions.c
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 /*
  * Test FreeRTOS debug functions and utilities.
  * - Queue registry functions vQueueAddToRegistry(), vQueueUnregisterQueue(),
diff --git a/components/freertos/test/test_queuesets.c b/components/freertos/test/integration/queue/test_queuesets.c
similarity index 97%
rename from components/freertos/test/test_queuesets.c
rename to components/freertos/test/integration/queue/test_queuesets.c
index 00e440d2e2..8a0971300b 100644
--- a/components/freertos/test/test_queuesets.c
+++ b/components/freertos/test/integration/queue/test_queuesets.c
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include "freertos/FreeRTOS.h"
diff --git a/components/freertos/test/test_stream_buffers.c b/components/freertos/test/integration/stream_buffer/test_stream_buffers.c
similarity index 95%
rename from components/freertos/test/test_stream_buffers.c
rename to components/freertos/test/integration/stream_buffer/test_stream_buffers.c
index 2b8ceeb731..56a7d63cda 100644
--- a/components/freertos/test/test_stream_buffers.c
+++ b/components/freertos/test/integration/stream_buffer/test_stream_buffers.c
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/components/freertos/test/test_freertos_get_state.c b/components/freertos/test/integration/tasks/test_freertos_get_state.c
similarity index 99%
rename from components/freertos/test/test_freertos_get_state.c
rename to components/freertos/test/integration/tasks/test_freertos_get_state.c
index 12023eded8..1aabe7648b 100644
--- a/components/freertos/test/test_freertos_get_state.c
+++ b/components/freertos/test/integration/tasks/test_freertos_get_state.c
@@ -3,6 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+
 #include "sdkconfig.h"
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/components/freertos/test/test_freertos_scheduling_round_robin.c b/components/freertos/test/integration/tasks/test_freertos_scheduling_round_robin.c
similarity index 98%
rename from components/freertos/test/test_freertos_scheduling_round_robin.c
rename to components/freertos/test/integration/tasks/test_freertos_scheduling_round_robin.c
index 15d8787410..7ccf594200 100644
--- a/components/freertos/test/test_freertos_scheduling_round_robin.c
+++ b/components/freertos/test/integration/tasks/test_freertos_scheduling_round_robin.c
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
diff --git a/components/freertos/test/test_freertos_task_delay_until.c b/components/freertos/test/integration/tasks/test_freertos_task_delay_until.c
similarity index 95%
rename from components/freertos/test/test_freertos_task_delay_until.c
rename to components/freertos/test/integration/tasks/test_freertos_task_delay_until.c
index 6f6359f414..921427e8ea 100644
--- a/components/freertos/test/test_freertos_task_delay_until.c
+++ b/components/freertos/test/integration/tasks/test_freertos_task_delay_until.c
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 /*
  Test for FreeRTOS vTaskDelayUntil() function by comparing the delay period of
  the function to comparing it to ref clock.
diff --git a/components/freertos/test/test_freertos_task_delete.c b/components/freertos/test/integration/tasks/test_freertos_task_delete.c
similarity index 98%
rename from components/freertos/test/test_freertos_task_delete.c
rename to components/freertos/test/integration/tasks/test_freertos_task_delete.c
index eb7428deb0..b09d841e6c 100644
--- a/components/freertos/test/test_freertos_task_delete.c
+++ b/components/freertos/test/integration/tasks/test_freertos_task_delete.c
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 /*
  * Test backported deletion behavior by creating tasks of various affinities and
  * check if the task memory is freed immediately under the correct conditions.
diff --git a/components/freertos/test/test_freertos_task_notify.c b/components/freertos/test/integration/tasks/test_freertos_task_notify.c
similarity index 99%
rename from components/freertos/test/test_freertos_task_notify.c
rename to components/freertos/test/integration/tasks/test_freertos_task_notify.c
index a28571a3f4..2f61597a0b 100644
--- a/components/freertos/test/test_freertos_task_notify.c
+++ b/components/freertos/test/integration/tasks/test_freertos_task_notify.c
@@ -3,6 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+
 /*
  Test of FreeRTOS task notifications. This test creates a sender and receiver
  task under different core permutations. For each permutation, the sender task
diff --git a/components/freertos/test/test_freertos_task_utilities.c b/components/freertos/test/integration/tasks/test_freertos_task_utilities.c
similarity index 97%
rename from components/freertos/test/test_freertos_task_utilities.c
rename to components/freertos/test/integration/tasks/test_freertos_task_utilities.c
index a9b186eecc..2bb5811a6e 100644
--- a/components/freertos/test/test_freertos_task_utilities.c
+++ b/components/freertos/test/integration/tasks/test_freertos_task_utilities.c
@@ -1,8 +1,9 @@
 /*
- * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "freertos/queue.h"
diff --git a/components/freertos/test/test_suspend_scheduler.c b/components/freertos/test/integration/tasks/test_suspend_scheduler.c
similarity index 99%
rename from components/freertos/test/test_suspend_scheduler.c
rename to components/freertos/test/integration/tasks/test_suspend_scheduler.c
index 61174b38de..37fba2dfaf 100644
--- a/components/freertos/test/test_suspend_scheduler.c
+++ b/components/freertos/test/integration/tasks/test_suspend_scheduler.c
@@ -3,6 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+
 /* Tests for FreeRTOS scheduler suspend & resume all tasks */
 #include "sdkconfig.h"
 #include <stdio.h>
diff --git a/components/freertos/test/test_task_priorities.c b/components/freertos/test/integration/tasks/test_task_priorities.c
similarity index 95%
rename from components/freertos/test/test_task_priorities.c
rename to components/freertos/test/integration/tasks/test_task_priorities.c
index 65041357c6..707f84175e 100644
--- a/components/freertos/test/test_task_priorities.c
+++ b/components/freertos/test/integration/tasks/test_task_priorities.c
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 /*
   Unit tests for FreeRTOS task priority get/set
 */
diff --git a/components/freertos/test/test_task_suspend_resume.c b/components/freertos/test/integration/tasks/test_task_suspend_resume.c
similarity index 99%
rename from components/freertos/test/test_task_suspend_resume.c
rename to components/freertos/test/integration/tasks/test_task_suspend_resume.c
index 2ad1373f74..31538c04b7 100644
--- a/components/freertos/test/test_task_suspend_resume.c
+++ b/components/freertos/test/integration/tasks/test_task_suspend_resume.c
@@ -3,6 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+
 /* Tests for FreeRTOS task suspend & resume */
 #include <stdio.h>
 #include <string.h>
diff --git a/components/freertos/test/test_tasks_snapshot.c b/components/freertos/test/integration/tasks/test_tasks_snapshot.c
similarity index 100%
rename from components/freertos/test/test_tasks_snapshot.c
rename to components/freertos/test/integration/tasks/test_tasks_snapshot.c
diff --git a/components/freertos/test/test_timers.c b/components/freertos/test/integration/timers/test_timers.c
similarity index 95%
rename from components/freertos/test/test_timers.c
rename to components/freertos/test/integration/timers/test_timers.c
index a87bf8ce12..f90b187f72 100644
--- a/components/freertos/test/test_timers.c
+++ b/components/freertos/test/integration/timers/test_timers.c
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 /* FreeRTOS timer tests
 */
 #include <stdio.h>
diff --git a/components/freertos/test/test_freertos_backported_functions.c b/components/freertos/test/miscellaneous/test_freertos_backported_functions.c
similarity index 98%
rename from components/freertos/test/test_freertos_backported_functions.c
rename to components/freertos/test/miscellaneous/test_freertos_backported_functions.c
index e56083ac09..67dfc8dab3 100644
--- a/components/freertos/test/test_freertos_backported_functions.c
+++ b/components/freertos/test/miscellaneous/test_freertos_backported_functions.c
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 /*
  * Test features that are backported from version FreeRTOS 9.0.0.
  *
diff --git a/components/freertos/test/test_freertos_mutex.c b/components/freertos/test/miscellaneous/test_freertos_mutex.c
similarity index 87%
rename from components/freertos/test/test_freertos_mutex.c
rename to components/freertos/test/miscellaneous/test_freertos_mutex.c
index c5ef46bf3d..4d6d4a0b75 100644
--- a/components/freertos/test/test_freertos_mutex.c
+++ b/components/freertos/test/miscellaneous/test_freertos_mutex.c
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "freertos/semphr.h"
diff --git a/components/freertos/test/test_freertos_trace_utilities.c b/components/freertos/test/miscellaneous/test_freertos_trace_utilities.c
similarity index 97%
rename from components/freertos/test/test_freertos_trace_utilities.c
rename to components/freertos/test/miscellaneous/test_freertos_trace_utilities.c
index a77d70498b..bce8992127 100644
--- a/components/freertos/test/test_freertos_trace_utilities.c
+++ b/components/freertos/test/miscellaneous/test_freertos_trace_utilities.c
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 /*
  * Test FreeRTOS trace facility functions. These following functions are enabled
  * when configUSE_TRACE_FACILITY is defined 1 in FreeRTOS.
diff --git a/components/freertos/test/test_panic.c b/components/freertos/test/miscellaneous/test_panic.c
similarity index 76%
rename from components/freertos/test/test_panic.c
rename to components/freertos/test/miscellaneous/test_panic.c
index 80cf7da4f7..714db87aef 100644
--- a/components/freertos/test/test_panic.c
+++ b/components/freertos/test/miscellaneous/test_panic.c
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 /*
  Test for multicore FreeRTOS. This test spins up threads, fiddles with queues etc.
 */
diff --git a/components/freertos/test/test_preemption.c b/components/freertos/test/miscellaneous/test_preemption.c
similarity index 99%
rename from components/freertos/test/test_preemption.c
rename to components/freertos/test/miscellaneous/test_preemption.c
index 739767da8f..3085c9250a 100644
--- a/components/freertos/test/test_preemption.c
+++ b/components/freertos/test/miscellaneous/test_preemption.c
@@ -3,6 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+
 /*
  Unit tests for FreeRTOS preemption
 */
diff --git a/components/freertos/test/test_freertos_scheduling_time.c b/components/freertos/test/performance/test_freertos_scheduling_time.c
similarity index 94%
rename from components/freertos/test/test_freertos_scheduling_time.c
rename to components/freertos/test/performance/test_freertos_scheduling_time.c
index d939b8e1ce..cd231aeb86 100644
--- a/components/freertos/test/test_freertos_scheduling_time.c
+++ b/components/freertos/test/performance/test_freertos_scheduling_time.c
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 #include <esp_types.h>
 #include <stdio.h>
 #include "freertos/FreeRTOS.h"
diff --git a/components/freertos/test/test_isr_latency.c b/components/freertos/test/performance/test_isr_latency.c
similarity index 97%
rename from components/freertos/test/test_isr_latency.c
rename to components/freertos/test/performance/test_isr_latency.c
index 81c6462d0d..79e4168600 100644
--- a/components/freertos/test/test_isr_latency.c
+++ b/components/freertos/test/performance/test_isr_latency.c
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 #include <esp_types.h>
 #include <stdio.h>
 #include "sdkconfig.h"
diff --git a/components/freertos/test/test_context_save_clobber.S b/components/freertos/test/port/test_context_save_clobber.S
similarity index 91%
rename from components/freertos/test/test_context_save_clobber.S
rename to components/freertos/test/port/test_context_save_clobber.S
index a9af1baa0a..fe72b8cf53 100644
--- a/components/freertos/test/test_context_save_clobber.S
+++ b/components/freertos/test/port/test_context_save_clobber.S
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 /* Helper function for the test case in test_context_save_clobber.c */
 
 #if defined(__XTENSA__)
diff --git a/components/freertos/test/test_context_save_clobber.c b/components/freertos/test/port/test_context_save_clobber.c
similarity index 92%
rename from components/freertos/test/test_context_save_clobber.c
rename to components/freertos/test/port/test_context_save_clobber.c
index 961b0e0a6f..e430a7da1d 100644
--- a/components/freertos/test/test_context_save_clobber.c
+++ b/components/freertos/test/port/test_context_save_clobber.c
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 #include "sdkconfig.h"
 #include "unity.h"
 #include "esp_intr_alloc.h"
diff --git a/components/freertos/test/test_float_in_isr.c b/components/freertos/test/port/test_float_in_isr.c
similarity index 92%
rename from components/freertos/test/test_float_in_isr.c
rename to components/freertos/test/port/test_float_in_isr.c
index f9093942ed..3269ca426a 100644
--- a/components/freertos/test/test_float_in_isr.c
+++ b/components/freertos/test/port/test_float_in_isr.c
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 #include <esp_types.h>
 #include <stdio.h>
 
diff --git a/components/freertos/test/test_freertos_hooks.c b/components/freertos/test/port/test_freertos_hooks.c
similarity index 100%
rename from components/freertos/test/test_freertos_hooks.c
rename to components/freertos/test/port/test_freertos_hooks.c
diff --git a/components/freertos/test/test_freertos_isinisrcontext.c b/components/freertos/test/port/test_freertos_isinisrcontext.c
similarity index 91%
rename from components/freertos/test/test_freertos_isinisrcontext.c
rename to components/freertos/test/port/test_freertos_isinisrcontext.c
index 8911733f8c..e1be84ef7f 100644
--- a/components/freertos/test/test_freertos_isinisrcontext.c
+++ b/components/freertos/test/port/test_freertos_isinisrcontext.c
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 /*
  See if xPortInIsrContext works
 */
diff --git a/components/freertos/test/test_newlib_reent.c b/components/freertos/test/port/test_newlib_reent.c
similarity index 92%
rename from components/freertos/test/test_newlib_reent.c
rename to components/freertos/test/port/test_newlib_reent.c
index ddc87e2c44..a5608cda92 100644
--- a/components/freertos/test/test_newlib_reent.c
+++ b/components/freertos/test/port/test_newlib_reent.c
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 /*
  Test for multicore FreeRTOS. This test spins up threads, fiddles with queues etc.
 */
diff --git a/components/freertos/test/test_spinlocks.c b/components/freertos/test/port/test_spinlocks.c
similarity index 99%
rename from components/freertos/test/test_spinlocks.c
rename to components/freertos/test/port/test_spinlocks.c
index 6ca657b726..40cee0c7fb 100644
--- a/components/freertos/test/test_spinlocks.c
+++ b/components/freertos/test/port/test_spinlocks.c
@@ -3,6 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+
 /*
  Combined unit tests & benchmarking for spinlock "portMUX" functionality
 */
diff --git a/components/freertos/test/test_thread_local.c b/components/freertos/test/port/test_thread_local.c
similarity index 97%
rename from components/freertos/test/test_thread_local.c
rename to components/freertos/test/port/test_thread_local.c
index ad3ed7302a..8fb9772ad2 100644
--- a/components/freertos/test/test_thread_local.c
+++ b/components/freertos/test/port/test_thread_local.c
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 /*
  Test for thread local storage support.
 */
diff --git a/components/freertos/test/test_xtensa_loadstore_handler.c b/components/freertos/test/port/test_xtensa_loadstore_handler.c
similarity index 100%
rename from components/freertos/test/test_xtensa_loadstore_handler.c
rename to components/freertos/test/port/test_xtensa_loadstore_handler.c