From c4dc3acba94dd7dfa7acd2c9ebe1f0e73443e13e Mon Sep 17 00:00:00 2001 From: Omar Chebib Date: Thu, 28 Jan 2021 19:09:49 +0800 Subject: [PATCH] heap: add light poisoning configuration to the tests. Relates to IDF-2653 --- components/heap/test/test_allocator_timings.c | 4 ++-- tools/ci/config/target-test.yml | 2 +- tools/unit-test-app/configs/heap_light_poison | 4 ++++ tools/unit-test-app/configs/heap_light_poison_c3 | 4 ++++ 4 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 tools/unit-test-app/configs/heap_light_poison create mode 100644 tools/unit-test-app/configs/heap_light_poison_c3 diff --git a/components/heap/test/test_allocator_timings.c b/components/heap/test/test_allocator_timings.c index 1287ca08da..0e130c95b6 100644 --- a/components/heap/test/test_allocator_timings.c +++ b/components/heap/test/test_allocator_timings.c @@ -9,8 +9,8 @@ #include #include -//This test only makes sense with poisoning disabled -#ifndef CONFIG_HEAP_POISONING_COMPREHENSIVE +//This test only makes sense with poisoning disabled (light or comprehensive) +#if !defined(CONFIG_HEAP_POISONING_COMPREHENSIVE) && !defined(CONFIG_HEAP_POISONING_LIGHT) #define NUM_POINTERS 128 #define ITERATIONS 10000 diff --git a/tools/ci/config/target-test.yml b/tools/ci/config/target-test.yml index cb7508b750..81a456d69a 100644 --- a/tools/ci/config/target-test.yml +++ b/tools/ci/config/target-test.yml @@ -573,7 +573,7 @@ UT_046: UT_C3: extends: .unit_test_c3_template - parallel: 27 + parallel: 28 tags: - ESP32C3_IDF - UT_T1_1 diff --git a/tools/unit-test-app/configs/heap_light_poison b/tools/unit-test-app/configs/heap_light_poison new file mode 100644 index 0000000000..540d65168b --- /dev/null +++ b/tools/unit-test-app/configs/heap_light_poison @@ -0,0 +1,4 @@ +CONFIG_IDF_TARGET="esp32" +TEST_COMPONENTS=heap +CONFIG_HEAP_POISONING_COMPREHENSIVE=n +CONFIG_HEAP_POISONING_LIGHT=y diff --git a/tools/unit-test-app/configs/heap_light_poison_c3 b/tools/unit-test-app/configs/heap_light_poison_c3 new file mode 100644 index 0000000000..270ffb6109 --- /dev/null +++ b/tools/unit-test-app/configs/heap_light_poison_c3 @@ -0,0 +1,4 @@ +CONFIG_IDF_TARGET="esp32c3" +TEST_COMPONENTS=heap +CONFIG_HEAP_POISONING_COMPREHENSIVE=n +CONFIG_HEAP_POISONING_LIGHT=y