Skip to content

Commit 082e598

Browse files
enjiamainashif
authored andcommitted
tests: lib: move the cmsis_dsp interpolation test to new ztest API
Migrate the testsuite tests/lib/cmsis_dsp/interpolation to the new ztest API. Signed-off-by: Enjia Mai <[email protected]>
1 parent 6310525 commit 082e598

File tree

8 files changed

+17
-85
lines changed

8 files changed

+17
-85
lines changed

tests/lib/cmsis_dsp/interpolation/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ target_sources(app PRIVATE
99
src/q15.c
1010
src/q31.c
1111
src/f32.c
12-
src/main.c
1312
)
1413

1514
target_sources_ifdef(CONFIG_CMSIS_DSP_FLOAT16 app PRIVATE src/f16.c)
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
CONFIG_ZTEST=y
2+
CONFIG_ZTEST_NEW_API=y
23
CONFIG_NEWLIB_LIBC=y
34
CONFIG_CMSIS_DSP=y
45
CONFIG_CMSIS_DSP_INTERPOLATION=y

tests/lib/cmsis_dsp/interpolation/src/f16.c

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#define REL_ERROR_THRESH (5.0e-3)
1818
#define ABS_ERROR_THRESH (5.0e-3)
1919

20-
void test_arm_linear_interp_f16(void)
20+
ZTEST(interpolation_f16, test_arm_linear_interp_f16)
2121
{
2222
arm_linear_interp_instance_f16 inst;
2323
size_t index;
@@ -56,7 +56,7 @@ void test_arm_linear_interp_f16(void)
5656
free(output);
5757
}
5858

59-
void test_arm_bilinear_interp_f16(void)
59+
ZTEST(interpolation_f16, test_arm_bilinear_interp_f16)
6060
{
6161
arm_bilinear_interp_instance_f16 inst;
6262
size_t index;
@@ -97,12 +97,4 @@ void test_arm_bilinear_interp_f16(void)
9797
free(output);
9898
}
9999

100-
void test_interpolation_f16(void)
101-
{
102-
ztest_test_suite(interpolation_f16,
103-
ztest_unit_test(test_arm_linear_interp_f16),
104-
ztest_unit_test(test_arm_bilinear_interp_f16)
105-
);
106-
107-
ztest_run_test_suite(interpolation_f16);
108-
}
100+
ZTEST_SUITE(interpolation_f16, NULL, NULL, NULL, NULL, NULL);

tests/lib/cmsis_dsp/interpolation/src/f32.c

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -137,27 +137,16 @@ static void test_arm_spline(
137137
free(coeff);
138138
}
139139

140-
DEFINE_TEST_VARIANT7(arm_spline, square_20,
140+
DEFINE_TEST_VARIANT7(interpolation_f32, arm_spline, square_20,
141141
in_spline_squ_x, in_spline_squ_y, in_spline_squ_xq, ref_spline_squ, 20,
142142
4, ARM_SPLINE_PARABOLIC_RUNOUT);
143143

144-
DEFINE_TEST_VARIANT7(arm_spline, sine_33,
144+
DEFINE_TEST_VARIANT7(interpolation_f32, arm_spline, sine_33,
145145
in_spline_sin_x, in_spline_sin_y, in_spline_sin_xq, ref_spline_sin, 33,
146146
9, ARM_SPLINE_NATURAL);
147147

148-
DEFINE_TEST_VARIANT7(arm_spline, ramp_30,
148+
DEFINE_TEST_VARIANT7(interpolation_f32, arm_spline, ramp_30,
149149
in_spline_ram_x, in_spline_ram_y, in_spline_ram_xq, ref_spline_ram, 30,
150150
3, ARM_SPLINE_PARABOLIC_RUNOUT);
151151

152-
void test_interpolation_f32(void)
153-
{
154-
ztest_test_suite(interpolation_f32,
155-
ztest_unit_test(test_arm_linear_interp_f32),
156-
ztest_unit_test(test_arm_bilinear_interp_f32),
157-
ztest_unit_test(test_arm_spline_square_20),
158-
ztest_unit_test(test_arm_spline_sine_33),
159-
ztest_unit_test(test_arm_spline_ramp_30)
160-
);
161-
162-
ztest_run_test_suite(interpolation_f32);
163-
}
152+
ZTEST_SUITE(interpolation_f32, NULL, NULL, NULL, NULL, NULL);

tests/lib/cmsis_dsp/interpolation/src/main.c

Lines changed: 0 additions & 25 deletions
This file was deleted.

tests/lib/cmsis_dsp/interpolation/src/q15.c

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#define SNR_ERROR_THRESH ((float32_t)70)
1717
#define ABS_ERROR_THRESH ((q15_t)2)
1818

19-
void test_arm_linear_interp_q15(void)
19+
ZTEST(interpolation_q15, test_arm_linear_interp_q15)
2020
{
2121
size_t index;
2222
size_t length = ARRAY_SIZE(ref_linear);
@@ -52,7 +52,7 @@ void test_arm_linear_interp_q15(void)
5252
free(output);
5353
}
5454

55-
void test_arm_bilinear_interp_q15(void)
55+
ZTEST(interpolation_q15, test_arm_bilinear_interp_q15)
5656
{
5757
arm_bilinear_interp_instance_q15 inst;
5858
size_t index;
@@ -92,12 +92,4 @@ void test_arm_bilinear_interp_q15(void)
9292
free(output);
9393
}
9494

95-
void test_interpolation_q15(void)
96-
{
97-
ztest_test_suite(interpolation_q15,
98-
ztest_unit_test(test_arm_linear_interp_q15),
99-
ztest_unit_test(test_arm_bilinear_interp_q15)
100-
);
101-
102-
ztest_run_test_suite(interpolation_q15);
103-
}
95+
ZTEST_SUITE(interpolation_q15, NULL, NULL, NULL, NULL, NULL);

tests/lib/cmsis_dsp/interpolation/src/q31.c

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#define SNR_ERROR_THRESH ((float32_t)100)
1717
#define ABS_ERROR_THRESH ((q31_t)2000)
1818

19-
void test_arm_linear_interp_q31(void)
19+
ZTEST(interpolation_q31, test_arm_linear_interp_q31)
2020
{
2121
size_t index;
2222
size_t length = ARRAY_SIZE(ref_linear);
@@ -52,7 +52,7 @@ void test_arm_linear_interp_q31(void)
5252
free(output);
5353
}
5454

55-
void test_arm_bilinear_interp_q31(void)
55+
ZTEST(interpolation_q31, test_arm_bilinear_interp_q31)
5656
{
5757
arm_bilinear_interp_instance_q31 inst;
5858
size_t index;
@@ -92,12 +92,4 @@ void test_arm_bilinear_interp_q31(void)
9292
free(output);
9393
}
9494

95-
void test_interpolation_q31(void)
96-
{
97-
ztest_test_suite(interpolation_q31,
98-
ztest_unit_test(test_arm_linear_interp_q31),
99-
ztest_unit_test(test_arm_bilinear_interp_q31)
100-
);
101-
102-
ztest_run_test_suite(interpolation_q31);
103-
}
95+
ZTEST_SUITE(interpolation_q31, NULL, NULL, NULL, NULL, NULL);

tests/lib/cmsis_dsp/interpolation/src/q7.c

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#define SNR_ERROR_THRESH ((float32_t)20)
1717
#define ABS_ERROR_THRESH ((q7_t)2)
1818

19-
void test_arm_linear_interp_q7(void)
19+
ZTEST(interpolation_q7, test_arm_linear_interp_q7)
2020
{
2121
size_t index;
2222
size_t length = ARRAY_SIZE(ref_linear);
@@ -52,7 +52,7 @@ void test_arm_linear_interp_q7(void)
5252
free(output);
5353
}
5454

55-
void test_arm_bilinear_interp_q7(void)
55+
ZTEST(interpolation_q7, test_arm_bilinear_interp_q7)
5656
{
5757
arm_bilinear_interp_instance_q7 inst;
5858
size_t index;
@@ -92,12 +92,4 @@ void test_arm_bilinear_interp_q7(void)
9292
free(output);
9393
}
9494

95-
void test_interpolation_q7(void)
96-
{
97-
ztest_test_suite(interpolation_q7,
98-
ztest_unit_test(test_arm_linear_interp_q7),
99-
ztest_unit_test(test_arm_bilinear_interp_q7)
100-
);
101-
102-
ztest_run_test_suite(interpolation_q7);
103-
}
95+
ZTEST_SUITE(interpolation_q7, NULL, NULL, NULL, NULL, NULL);

0 commit comments

Comments
 (0)