benchmark: Fix test log to match output

Author: Andres Amaya Garcia

benchmark/main.cpp

@@ -747,6 +747,7 @@ MBED_NOINLINE static int benchmark_ctr_drbg()
 {
     int ret = 0;
     const char *nopr_title = "CTR_DRBG (NOPR)";
+    const char *pr_title = "CTR_DRBG (PR)";
     mbedtls_ctr_drbg_context ctr_drbg;
 
     mbedtls_ctr_drbg_init(&ctr_drbg);
@@ -755,6 +756,7 @@ MBED_NOINLINE static int benchmark_ctr_drbg()
     if (ret == MBEDTLS_ERR_AES_FEATURE_UNAVAILABLE) {
         /* Do not consider this as a failure */
         mbedtls_printf(HEADER_FORMAT "Feature unavailable\n", nopr_title);
+        mbedtls_printf(HEADER_FORMAT "Feature unavailable\n", pr_title);
         goto exit;
     } else if (ret != 0) {
         PRINT_ERROR(ret, "mbedtls_ctr_drbg_seed()");
@@ -772,7 +774,7 @@ MBED_NOINLINE static int benchmark_ctr_drbg()
 
     mbedtls_ctr_drbg_set_prediction_resistance(&ctr_drbg,
             MBEDTLS_CTR_DRBG_PR_ON);
-    BENCHMARK_FUNC_CALL("CTR_DRBG (PR)",
+    BENCHMARK_FUNC_CALL(pr_title,
                         mbedtls_ctr_drbg_random(&ctr_drbg, buf, BUFSIZE));
 
 exit:

tests/benchmark.log

@@ -8,30 +8,30 @@
 \s+3DES\s*:\s*\d+ KB/s
 \s+DES\s*:\s*\d+ KB/s
 \s+3DES-CMAC\s*:\s*\d+ KB/s
-\s+AES-CBC-128\s*:\s*\d+ KB/s
-\s+AES-CBC-192\s*:\s*\d+ KB/s
-\s+AES-CBC-256\s*:\s*\d+ KB/s
-\s+AES-CTR-128\s*:\s*\d+ KB/s
-\s+AES-CTR-192\s*:\s*\d+ KB/s
-\s+AES-CTR-256\s*:\s*\d+ KB/s
-\s+AES-GCM-128\s*:\s*\d+ KB/s
-\s+AES-GCM-192\s*:\s*\d+ KB/s
-\s+AES-GCM-256\s*:\s*\d+ KB/s
-\s+AES-CCM-128\s*:\s*\d+ KB/s
-\s+AES-CCM-192\s*:\s*\d+ KB/s
-\s+AES-CCM-256\s*:\s*\d+ KB/s
-\s+AES-CMAC-128\s*:\s*\d+ KB/s
-\s+AES-CMAC-192\s*:\s*\d+ KB/s
-\s+AES-CMAC-256\s*:\s*\d+ KB/s
-\s+AES-CMAC-PRF-128\s*:\s*\d+ KB/s
+\s+AES-CBC-128\s*:\s*(\d+ KB/s|Feature unavailable)
+\s+AES-CBC-192\s*:\s*(\d+ KB/s|Feature unavailable)
+\s+AES-CBC-256\s*:\s*(\d+ KB/s|Feature unavailable)
+\s+AES-CTR-128\s*:\s*(\d+ KB/s|Feature unavailable)
+\s+AES-CTR-192\s*:\s*(\d+ KB/s|Feature unavailable)
+\s+AES-CTR-256\s*:\s*(\d+ KB/s|Feature unavailable)
+\s+AES-GCM-128\s*:\s*(\d+ KB/s|Feature unavailable)
+\s+AES-GCM-192\s*:\s*(\d+ KB/s|Feature unavailable)
+\s+AES-GCM-256\s*:\s*(\d+ KB/s|Feature unavailable)
+\s+AES-CCM-128\s*:\s*(\d+ KB/s|Feature unavailable)
+\s+AES-CCM-192\s*:\s*(\d+ KB/s|Feature unavailable)
+\s+AES-CCM-256\s*:\s*(\d+ KB/s|Feature unavailable)
+\s+AES-CMAC-128\s*:\s*(\d+ KB/s|Feature unavailable)
+\s+AES-CMAC-192\s*:\s*(\d+ KB/s|Feature unavailable)
+\s+AES-CMAC-256\s*:\s*(\d+ KB/s|Feature unavailable)
+\s+AES-CMAC-PRF-128\s*:\s*(\d+ KB/s|Feature unavailable)
 \s+CAMELLIA-CBC-128\s*:\s*\d+ KB/s
 \s+CAMELLIA-CBC-192\s*:\s*\d+ KB/s
 \s+CAMELLIA-CBC-256\s*:\s*\d+ KB/s
 \s+BLOWFISH-CBC-128\s*:\s*\d+ KB/s
 \s+BLOWFISH-CBC-192\s*:\s*\d+ KB/s
 \s+BLOWFISH-CBC-256\s*:\s*\d+ KB/s
-\s+CTR_DRBG (NOPR)\s*:\s*\d+ KB/s
-\s+CTR_DRBG (PR)\s*:\s*\d+ KB/s
+\s+CTR_DRBG (NOPR)\s*:\s*(\d+ KB/s|Feature unavailable)
+\s+CTR_DRBG (PR)\s*:\s*(\d+ KB/s|Feature unavailable)
 \s+HMAC_DRBG SHA-1 (NOPR)\s*:\s*\d+ KB/s
 \s+HMAC_DRBG SHA-1 (PR)\s*:\s*\d+ KB/s
 \s+HMAC_DRBG SHA-256 (NOPR)\s*:\s*\d+ KB/s