component-configuration-crypto: Undo modifications to reference components.

analyze_outcomes will fail when the libtestdriver1 is using
cmake and the reference component is on cmake.

Signed-off-by: Minos Galanakis <minos.galanakis@arm.com>

Author: minosgalanakis

tests/scripts/components-configuration-crypto.sh

@@ -972,11 +972,10 @@ component_test_psa_crypto_config_reference_ecc_ecp_light_only () {
 
     config_psa_crypto_config_ecp_light_only 0
 
-    cmake -D CMAKE_BUILD_TYPE:String=Release .
-    cmake --build .
+    $MAKE_COMMAND
 
     msg "test suites: full with non-accelerated EC algs"
-    make test
+    $MAKE_COMMAND test
 
     msg "ssl-opt: full with non-accelerated EC algs"
     tests/ssl-opt.sh
@@ -1071,11 +1070,10 @@ component_test_psa_crypto_config_reference_ecc_no_ecp_at_all () {
 
     config_psa_crypto_no_ecp_at_all 0
 
-    cmake -D CMAKE_BUILD_TYPE:String=Release .
-    cmake --build .
+    $MAKE_COMMAND
 
     msg "test: full + non accelerated EC algs"
-    make test
+    $MAKE_COMMAND test
 
     msg "ssl-opt: full + non accelerated EC algs"
     tests/ssl-opt.sh
@@ -1238,11 +1236,10 @@ common_test_psa_crypto_config_reference_ecc_ffdh_no_bignum () {
 
     config_psa_crypto_config_accel_ecc_ffdh_no_bignum 0 "$test_target"
 
-    cmake -D CMAKE_BUILD_TYPE:String=Release .
-    cmake --build .
+    $MAKE_COMMAND
 
     msg "test suites: full + non accelerated EC algs + USE_PSA"
-    make test
+    $MAKE_COMMAND test
 
     msg "ssl-opt: full + non accelerated $accel_text algs + USE_PSA"
     tests/ssl-opt.sh
@@ -1444,13 +1441,12 @@ component_test_psa_crypto_config_reference_rsa_crypto () {
 
     # Build
     # -----
-    cmake -D CMAKE_BUILD_TYPE:String=Release .
-    cmake --build .
+    $MAKE_COMMAND
 
     # Run the tests
     # -------------
     msg "test: crypto_full with non-accelerated RSA"
-    make test
+    $MAKE_COMMAND test
 }
 
 # This is a temporary test to verify that full RSA support is present even when
@@ -1600,11 +1596,10 @@ component_test_psa_crypto_config_reference_hash_use_psa () {
 
     config_psa_crypto_hash_use_psa 0
 
-    cmake -D CMAKE_BUILD_TYPE:String=Release .
-    cmake --build .
+    $MAKE_COMMAND
 
     msg "test: full without accelerated hashes"
-    make test
+    $MAKE_COMMAND test
 
     msg "test: ssl-opt.sh, full without accelerated hashes"
     tests/ssl-opt.sh
@@ -1670,11 +1665,10 @@ component_test_psa_crypto_config_reference_hmac () {
 
     config_psa_crypto_hmac_use_psa 0
 
-    cmake -D CMAKE_BUILD_TYPE:String=Release .
-    cmake --build .
+    $MAKE_COMMAND
 
     msg "test: full without accelerated hmac"
-    make test
+    $MAKE_COMMAND test
 }
 
 component_test_psa_crypto_config_accel_aead () {
@@ -1775,11 +1769,10 @@ component_test_psa_crypto_config_reference_cipher_aead_cmac () {
     msg "build: full config with non-accelerated cipher inc. AEAD and CMAC"
     common_psa_crypto_config_accel_cipher_aead_cmac
 
-    cmake -D CMAKE_BUILD_TYPE:String=Release .
-    cmake --build .
+    $MAKE_COMMAND
 
     msg "test: full config with non-accelerated cipher inc. AEAD and CMAC"
-    make test
+    $MAKE_COMMAND test
 
     msg "ssl-opt: full config with non-accelerated cipher inc. AEAD and CMAC"
     # Exclude password-protected key tests as in test_psa_crypto_config_accel_cipher_aead_cmac.
@@ -1890,11 +1883,10 @@ component_test_full_block_cipher_legacy_dispatch () {
 
     common_block_cipher_dispatch 0
 
-    cmake -D CMAKE_BUILD_TYPE:String=Release .
-    cmake --build .
+    $MAKE_COMMAND
 
     msg "test: full + legacy dispatch in block_cipher"
-    make test
+    $MAKE_COMMAND test
 }
 
 component_test_aead_chachapoly_disabled () {