commit bb0e48f94f456e099ae58848537c22c87438ea9f
author Paul Elliott <paul.elliott@arm.com> Fri Dec 01 18:05:19 2023 +0000
committer Paul Elliott <paul.elliott@arm.com> Mon Dec 18 14:49:34 2023 +0000
tree 53a63b488898d6eab1802bc936a5916b1c650d2c
parent fed410f58e4370cbd6025d959ac6084fe5864d73

Make number of threads a test argument

Remove hard coded number of threads.

Signed-off-by: Paul Elliott <paul.elliott@arm.com>

tests/suites/test_suite_ctr_drbg.data

diff --git a/tests/suites/test_suite_ctr_drbg.data b/tests/suites/test_suite_ctr_drbg.data
index 1cc51e3..b519da8 100644
--- a/tests/suites/test_suite_ctr_drbg.data
+++ b/tests/suites/test_suite_ctr_drbg.data
@@ -1098,11 +1098,11 @@
 
 CTR_DRBG Threads: no reseed
 depends_on:!MBEDTLS_CTR_DRBG_USE_128_BIT_KEY:!MBEDTLS_AES_ONLY_128_BIT_KEY_LENGTH:!MBEDTLS_ENTROPY_FORCE_SHA256:MBEDTLS_SHA512_C
-ctr_drbg_threads:"1fafa98bc83d95e10f2d5ed339a553e1":0
+ctr_drbg_threads:"1fafa98bc83d95e10f2d5ed339a553e1":0:5
 
 CTR_DRBG Threads: reseed
 depends_on:!MBEDTLS_CTR_DRBG_USE_128_BIT_KEY:!MBEDTLS_AES_ONLY_128_BIT_KEY_LENGTH:!MBEDTLS_ENTROPY_FORCE_SHA256:MBEDTLS_SHA512_C
-ctr_drbg_threads:"B10A961F2EA39927B4C48AEDDD299026":1
+ctr_drbg_threads:"B10A961F2EA39927B4C48AEDDD299026":1:5
 
 CTR_DRBG self test
 ctr_drbg_selftest:

tests/suites/test_suite_ctr_drbg.function

diff --git a/tests/suites/test_suite_ctr_drbg.function b/tests/suites/test_suite_ctr_drbg.function
index 329c222..a5a85a0 100644
--- a/tests/suites/test_suite_ctr_drbg.function
+++ b/tests/suites/test_suite_ctr_drbg.function
@@ -343,16 +343,17 @@
 /* END_CASE */
 
 /* BEGIN_CASE depends_on:MBEDTLS_THREADING_PTHREAD */
-void ctr_drbg_threads(data_t *expected_result, int reseed)
+void ctr_drbg_threads(data_t *expected_result, int reseed, int arg_thread_count)
 {
-#define THREAD_CNT 5
-    pthread_t threads[THREAD_CNT];
+    size_t thread_count = (size_t) arg_thread_count;
+    pthread_t *threads = NULL;
 
     unsigned char out[16];
     unsigned char *entropy = NULL;
 
-    const size_t n_random_calls = THREAD_CNT * thread_random_reps + 1;
+    const size_t n_random_calls = thread_count * thread_random_reps + 1;
 
+    TEST_CALLOC(threads, sizeof(pthread_t) * thread_count);
     memset(out, 0, sizeof(out));
 
     mbedtls_ctr_drbg_context ctx;
@@ -380,14 +381,14 @@
         mbedtls_ctr_drbg_seed(&ctx, mbedtls_test_entropy_func, entropy, NULL, 0),
         0);
 
-    for (size_t i = 0; i < THREAD_CNT; i++) {
+    for (size_t i = 0; i < thread_count; i++) {
         TEST_EQUAL(
             pthread_create(&threads[i], NULL,
                            thread_random_function, (void *) &ctx),
             0);
     }
 
-    for (size_t i = 0; i < THREAD_CNT; i++) {
+    for (size_t i = 0; i < thread_count; i++) {
         TEST_EQUAL(pthread_join(threads[i], NULL), 0);
     }
 
@@ -399,8 +400,8 @@
 exit:
     mbedtls_ctr_drbg_free(&ctx);
     mbedtls_free(entropy);
+    mbedtls_free(threads);
 }
-#undef THREAD_CNT
 /* END_CASE */
 
 /* BEGIN_CASE depends_on:MBEDTLS_FS_IO */