Skip to content

Commit a861781

Browse files
committed
Revert "Revert "UT: Add streambuffer test to make PR FreeRTOS#391 pass (FreeRTOS#690)""
This reverts commit 7340a72.
1 parent 74e03dd commit a861781

File tree

6 files changed

+464
-37
lines changed

6 files changed

+464
-37
lines changed
Lines changed: 9 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,15 @@
1-
# indent with spaces
1+
# Indent with spaces
22
.RECIPEPREFIX := $(.RECIPEPREFIX) $(.RECIPEPREFIX)
3-
43
# Do not move this line below the include
5-
MAKEFILE_ABSPATH := $(abspath $(lastword $(MAKEFILE_LIST)))
4+
MAKEFILE_ABSPATH := $(abspath $(lastword $(MAKEFILE_LIST)))
65
include ../makefile.in
76

8-
# PROJECT_SRC lists the .c files under test
9-
PROJECT_SRC := stream_buffer.c
10-
11-
# PROJECT_DEPS_SRC list the .c file that are dependencies of PROJECT_SRC files
12-
# Files in PROJECT_DEPS_SRC are excluded from coverage measurements
13-
PROJECT_DEPS_SRC :=
14-
15-
# PROJECT_HEADER_DEPS: headers that should be excluded from coverage measurements.
16-
PROJECT_HEADER_DEPS := FreeRTOS.h
17-
18-
# SUITE_UT_SRC: .c files that contain test cases (must end in _utest.c)
19-
SUITE_UT_SRC := message_buffer_utest.c
20-
21-
# SUITE_SUPPORT_SRC: .c files used for testing that do not contain test cases.
22-
# Paths are relative to PROJECT_DIR
23-
SUITE_SUPPORT_SRC :=
24-
25-
# List the headers used by PROJECT_SRC that you would like to mock
26-
MOCK_FILES_FP := $(KERNEL_DIR)/include/task.h
27-
MOCK_FILES_FP += $(UT_ROOT_DIR)/config/fake_assert.h
28-
MOCK_FILES_FP += $(UT_ROOT_DIR)/config/fake_port.h
29-
30-
# List any addiitonal flags needed by the preprocessor
31-
CPPFLAGS += -DportUSING_MPU_WRAPPERS=0
32-
33-
# List any addiitonal flags needed by the compiler
34-
CFLAGS +=
35-
36-
# Try not to edit beyond this line unless necessary.
37-
38-
# Project is determined based on path: $(UT_ROOT_DIR)/$(PROJECT)
39-
PROJECT := $(lastword $(subst /, ,$(dir $(abspath $(MAKEFILE_ABSPATH)))))
7+
# SUITES lists the suites contained in subdirectories of this directory
8+
SUITES += size_mismatch
9+
SUITES += message_buffer
4010

41-
export
11+
# PROJECT and SUITE variables are determined based on path like so:
12+
# $(UT_ROOT_DIR)/$(PROJECT)/$(SUITE)
13+
PROJECT := $(lastword $(subst /, ,$(dir $(abspath $(MAKEFILE_ABSPATH)))))
4214

43-
include ../testdir.mk
15+
include ../subdir.mk
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# Indent with spaces
2+
.RECIPEPREFIX := $(.RECIPEPREFIX) $(.RECIPEPREFIX)
3+
4+
# Do not move this line below the include
5+
MAKEFILE_ABSPATH := $(abspath $(lastword $(MAKEFILE_LIST)))
6+
include ../../makefile.in
7+
8+
# PROJECT_SRC lists the .c files under test
9+
PROJECT_SRC += stream_buffer.c
10+
11+
# PROJECT_DEPS_SRC list the .c file that are dependencies of PROJECT_SRC files
12+
# Files in PROJECT_DEPS_SRC are excluded from coverage measurements
13+
PROJECT_DEPS_SRC += list.c
14+
15+
# PROJECT_HEADER_DEPS: headers that should be excluded from coverage measurements.
16+
PROJECT_HEADER_DEPS += FreeRTOS.h
17+
18+
# SUITE_UT_SRC: .c files that contain test cases (must end in _utest.c)
19+
SUITE_UT_SRC += message_buffer_utest.c
20+
21+
# SUITE_SUPPORT_SRC: .c files used for testing that do not contain test cases.
22+
# Paths are relative to PROJECT_DIR
23+
SUITE_SUPPORT_SRC +=
24+
25+
# List the headers used by PROJECT_SRC that you would like to mock
26+
MOCK_FILES_FP += $(KERNEL_DIR)/include/task.h
27+
MOCK_FILES_FP += $(UT_ROOT_DIR)/config/fake_assert.h
28+
MOCK_FILES_FP += $(UT_ROOT_DIR)/config/fake_port.h
29+
30+
# List any addiitonal flags needed by the preprocessor
31+
CPPFLAGS += -DportUSING_MPU_WRAPPERS=0
32+
33+
# List any addiitonal flags needed by the compiler
34+
CFLAGS +=
35+
36+
# Try not to edit beyond this line unless necessary.
37+
38+
# Project / Suite are determined based on path: $(UT_ROOT_DIR)/$(PROJECT)/$(SUITE)
39+
PROJECT := $(lastword $(subst /, ,$(dir $(abspath $(MAKEFILE_ABSPATH)/../))))
40+
SUITE := $(lastword $(subst /, ,$(dir $(MAKEFILE_ABSPATH))))
41+
42+
# Make variables available to included makefile
43+
export
44+
45+
include ../../testdir.mk
Lines changed: 142 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,142 @@
1+
/*
2+
* FreeRTOS V202107.00
3+
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
4+
*
5+
* Permission is hereby granted, free of charge, to any person obtaining a copy of
6+
* this software and associated documentation files (the "Software"), to deal in
7+
* the Software without restriction, including without limitation the rights to
8+
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
9+
* the Software, and to permit persons to whom the Software is furnished to do so,
10+
* subject to the following conditions:
11+
*
12+
* The above copyright notice and this permission notice shall be included in all
13+
* copies or substantial portions of the Software.
14+
*
15+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
17+
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
18+
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
19+
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
20+
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
21+
*
22+
* https://www.FreeRTOS.org
23+
* https://github.com/FreeRTOS
24+
*
25+
*/
26+
27+
28+
#ifndef FREERTOS_CONFIG_H
29+
#define FREERTOS_CONFIG_H
30+
31+
#include "fake_assert.h"
32+
33+
/*-----------------------------------------------------------
34+
* Application specific definitions.
35+
*
36+
* These definitions should be adjusted for your particular hardware and
37+
* application requirements.
38+
*
39+
* THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
40+
* FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE. See
41+
* http://www.freertos.org/a00110.html
42+
*----------------------------------------------------------*/
43+
44+
#define configUSE_PREEMPTION 1
45+
#define configUSE_PORT_OPTIMISED_TASK_SELECTION 1
46+
#define configUSE_IDLE_HOOK 1
47+
#define configUSE_TICK_HOOK 1
48+
#define configUSE_DAEMON_TASK_STARTUP_HOOK 1
49+
#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. */
50+
#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. */
51+
#define configTOTAL_HEAP_SIZE ( ( size_t ) ( 52 * 1024 ) )
52+
#define configMAX_TASK_NAME_LEN ( 12 )
53+
#define configUSE_TRACE_FACILITY 0
54+
#define configUSE_16_BIT_TICKS 0
55+
#define configIDLE_SHOULD_YIELD 1
56+
#define configUSE_MUTEXES 1
57+
#define configCHECK_FOR_STACK_OVERFLOW 0
58+
#define configUSE_RECURSIVE_MUTEXES 1
59+
#define configQUEUE_REGISTRY_SIZE 0
60+
#define configUSE_MALLOC_FAILED_HOOK 1
61+
#define configUSE_APPLICATION_TASK_TAG 1
62+
#define configUSE_COUNTING_SEMAPHORES 1
63+
#define configUSE_ALTERNATIVE_API 0
64+
#define configUSE_QUEUE_SETS 0
65+
#define configUSE_TASK_NOTIFICATIONS 1
66+
#define configTASK_NOTIFICATION_ARRAY_ENTRIES 5
67+
#define configSUPPORT_STATIC_ALLOCATION 1
68+
#define configSUPPORT_DYNAMIC_ALLOCATION 1
69+
#define configINITIAL_TICK_COUNT ( ( TickType_t ) 0 ) /* For test. */
70+
#define configSTREAM_BUFFER_TRIGGER_LEVEL_TEST_MARGIN 1 /* As there are a lot of tasks running. */
71+
#define configMESSAGE_BUFFER_LENGTH_TYPE uint8_t
72+
73+
/* Software timer related configuration options. */
74+
#define configUSE_TIMERS 1
75+
#define configTIMER_TASK_PRIORITY ( configMAX_PRIORITIES - 1 )
76+
#define configTIMER_QUEUE_LENGTH 20
77+
#define configTIMER_TASK_STACK_DEPTH ( configMINIMAL_STACK_SIZE * 2 )
78+
79+
#define configMAX_PRIORITIES ( 7 )
80+
81+
/* Run time stats gathering configuration options. */
82+
unsigned long ulGetRunTimeCounterValue( void ); /* Prototype of function that returns run time counter. */
83+
void vConfigureTimerForRunTimeStats( void ); /* Prototype of function that initialises the run time counter. */
84+
#define configGENERATE_RUN_TIME_STATS 1
85+
#define portCONFIGURE_TIMER_FOR_RUN_TIME_STATS() vConfigureTimerForRunTimeStats()
86+
#define portGET_RUN_TIME_COUNTER_VALUE() ulGetRunTimeCounterValue()
87+
88+
/* Co-routine related configuration options. */
89+
#define configUSE_CO_ROUTINES 0
90+
#define configMAX_CO_ROUTINE_PRIORITIES ( 2 )
91+
92+
/* This demo makes use of one or more example stats formatting functions. These
93+
* format the raw data provided by the uxTaskGetSystemState() function in to human
94+
* readable ASCII form. See the notes in the implementation of vTaskList() within
95+
* FreeRTOS/Source/tasks.c for limitations. */
96+
#define configUSE_STATS_FORMATTING_FUNCTIONS 1
97+
98+
/* Set the following definitions to 1 to include the API function, or zero
99+
* to exclude the API function. In most cases the linker will remove unused
100+
* functions anyway. */
101+
#define INCLUDE_vTaskPrioritySet 1
102+
#define INCLUDE_uxTaskPriorityGet 1
103+
#define INCLUDE_vTaskDelete 1
104+
#define INCLUDE_vTaskCleanUpResources 0
105+
#define INCLUDE_vTaskSuspend 1
106+
#define INCLUDE_vTaskDelayUntil 1
107+
#define INCLUDE_vTaskDelay 1
108+
#define INCLUDE_uxTaskGetStackHighWaterMark 1
109+
#define INCLUDE_xTaskGetSchedulerState 1
110+
#define INCLUDE_xTimerGetTimerDaemonTaskHandle 1
111+
#define INCLUDE_xTaskGetIdleTaskHandle 1
112+
#define INCLUDE_xTaskGetHandle 1
113+
#define INCLUDE_eTaskGetState 1
114+
#define INCLUDE_xSemaphoreGetMutexHolder 1
115+
#define INCLUDE_xTimerPendFunctionCall 1
116+
#define INCLUDE_xTaskAbortDelay 1
117+
118+
/* It is a good idea to define configASSERT() while developing. configASSERT()
119+
* uses the same semantics as the standard C assert() macro. */
120+
#define configASSERT( x ) \
121+
do \
122+
{ \
123+
if( x ) \
124+
{ \
125+
vFakeAssert( true, __FILE__, __LINE__ ); \
126+
} \
127+
else \
128+
{ \
129+
vFakeAssert( false, __FILE__, __LINE__ ); \
130+
} \
131+
} while( 0 )
132+
133+
134+
#define mtCOVERAGE_TEST_MARKER() __asm volatile ( "NOP" )
135+
136+
#define configINCLUDE_MESSAGE_BUFFER_AMP_DEMO 0
137+
#if ( configINCLUDE_MESSAGE_BUFFER_AMP_DEMO == 1 )
138+
extern void vGenerateCoreBInterrupt( void * xUpdatedMessageBuffer );
139+
#define sbSEND_COMPLETED( pxStreamBuffer ) vGenerateCoreBInterrupt( pxStreamBuffer )
140+
#endif /* configINCLUDE_MESSAGE_BUFFER_AMP_DEMO */
141+
142+
#endif /* FREERTOS_CONFIG_H */
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# Indent with spaces
2+
.RECIPEPREFIX := $(.RECIPEPREFIX) $(.RECIPEPREFIX)
3+
4+
# Do not move this line below the include
5+
MAKEFILE_ABSPATH := $(abspath $(lastword $(MAKEFILE_LIST)))
6+
include ../../makefile.in
7+
8+
# PROJECT_SRC lists the .c files under test
9+
PROJECT_SRC += stream_buffer.c
10+
11+
# PROJECT_DEPS_SRC list the .c file that are dependencies of PROJECT_SRC files
12+
# Files in PROJECT_DEPS_SRC are excluded from coverage measurements
13+
PROJECT_DEPS_SRC += list.c
14+
15+
# PROJECT_HEADER_DEPS: headers that should be excluded from coverage measurements.
16+
PROJECT_HEADER_DEPS += FreeRTOS.h
17+
18+
# SUITE_UT_SRC: .c files that contain test cases (must end in _utest.c)
19+
SUITE_UT_SRC += message_buffer_utest.c
20+
21+
# SUITE_SUPPORT_SRC: .c files used for testing that do not contain test cases.
22+
# Paths are relative to PROJECT_DIR
23+
SUITE_SUPPORT_SRC +=
24+
25+
# List the headers used by PROJECT_SRC that you would like to mock
26+
MOCK_FILES_FP += $(KERNEL_DIR)/include/task.h
27+
MOCK_FILES_FP += $(UT_ROOT_DIR)/config/fake_assert.h
28+
MOCK_FILES_FP += $(UT_ROOT_DIR)/config/fake_port.h
29+
30+
# List any addiitonal flags needed by the preprocessor
31+
CPPFLAGS += -DportUSING_MPU_WRAPPERS=0 -I .
32+
33+
# List any addiitonal flags needed by the compiler
34+
CFLAGS +=
35+
36+
# Try not to edit beyond this line unless necessary.
37+
38+
# Project / Suite are determined based on path: $(UT_ROOT_DIR)/$(PROJECT)/$(SUITE)
39+
PROJECT := $(lastword $(subst /, ,$(dir $(abspath $(MAKEFILE_ABSPATH)/../))))
40+
SUITE := $(lastword $(subst /, ,$(dir $(MAKEFILE_ABSPATH))))
41+
42+
# Make variables available to included makefile
43+
export
44+
45+
include ../../testdir.mk

0 commit comments

Comments
 (0)