From 6dc2651f02a4aa9d419b8e5ef3bdb02028c568ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Thu, 25 Jun 2015 10:48:24 +0200 Subject: [PATCH] Cosmetics --- tests/Makefile | 50 ++++++++++++++++++++++---------------------- tests/scripts/all.sh | 2 +- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 319ca54f1..ae84b61b1 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -95,103 +95,103 @@ $(DEP): make -C ../library test_suite_aes.ecb.c : suites/test_suite_aes.function suites/test_suite_aes.ecb.data scripts/generate_code.pl suites/helpers.function suites/main_test.function - echo " Generate $@" + echo " Gen $@" scripts/generate_code.pl suites test_suite_aes test_suite_aes.ecb test_suite_aes.cbc.c : suites/test_suite_aes.function suites/test_suite_aes.cbc.data scripts/generate_code.pl suites/helpers.function suites/main_test.function - echo " Generate $@" + echo " Gen $@" scripts/generate_code.pl suites test_suite_aes test_suite_aes.cbc test_suite_aes.cfb.c : suites/test_suite_aes.function suites/test_suite_aes.cfb.data scripts/generate_code.pl suites/helpers.function suites/main_test.function - echo " Generate $@" + echo " Gen $@" scripts/generate_code.pl suites test_suite_aes test_suite_aes.cfb test_suite_aes.rest.c : suites/test_suite_aes.function suites/test_suite_aes.rest.data scripts/generate_code.pl suites/helpers.function suites/main_test.function - echo " Generate $@" + echo " Gen $@" scripts/generate_code.pl suites test_suite_aes test_suite_aes.rest test_suite_cipher.aes.c : suites/test_suite_cipher.function suites/test_suite_cipher.aes.data scripts/generate_code.pl suites/helpers.function suites/main_test.function - echo " Generate $@" + echo " Gen $@" scripts/generate_code.pl suites test_suite_cipher test_suite_cipher.aes test_suite_cipher.arc4.c : suites/test_suite_cipher.function suites/test_suite_cipher.arc4.data scripts/generate_code.pl suites/helpers.function suites/main_test.function - echo " Generate $@" + echo " Gen $@" scripts/generate_code.pl suites test_suite_cipher test_suite_cipher.arc4 test_suite_cipher.ccm.c : suites/test_suite_cipher.function suites/test_suite_cipher.ccm.data scripts/generate_code.pl suites/helpers.function suites/main_test.function - echo " Generate $@" + echo " Gen $@" scripts/generate_code.pl suites test_suite_cipher test_suite_cipher.ccm test_suite_cipher.gcm.c : suites/test_suite_cipher.function suites/test_suite_cipher.gcm.data scripts/generate_code.pl suites/helpers.function suites/main_test.function - echo " Generate $@" + echo " Gen $@" scripts/generate_code.pl suites test_suite_cipher test_suite_cipher.gcm test_suite_cipher.blowfish.c : suites/test_suite_cipher.function suites/test_suite_cipher.blowfish.data scripts/generate_code.pl suites/helpers.function suites/main_test.function - echo " Generate $@" + echo " Gen $@" scripts/generate_code.pl suites test_suite_cipher test_suite_cipher.blowfish test_suite_cipher.camellia.c : suites/test_suite_cipher.function suites/test_suite_cipher.camellia.data scripts/generate_code.pl suites/helpers.function suites/main_test.function - echo " Generate $@" + echo " Gen $@" scripts/generate_code.pl suites test_suite_cipher test_suite_cipher.camellia test_suite_cipher.des.c : suites/test_suite_cipher.function suites/test_suite_cipher.des.data scripts/generate_code.pl suites/helpers.function suites/main_test.function - echo " Generate $@" + echo " Gen $@" scripts/generate_code.pl suites test_suite_cipher test_suite_cipher.des test_suite_cipher.null.c : suites/test_suite_cipher.function suites/test_suite_cipher.null.data scripts/generate_code.pl suites/helpers.function suites/main_test.function - echo " Generate $@" + echo " Gen $@" scripts/generate_code.pl suites test_suite_cipher test_suite_cipher.null test_suite_cipher.padding.c : suites/test_suite_cipher.function suites/test_suite_cipher.padding.data scripts/generate_code.pl suites/helpers.function suites/main_test.function - echo " Generate $@" + echo " Gen $@" scripts/generate_code.pl suites test_suite_cipher test_suite_cipher.padding test_suite_gcm.aes128_de.c : suites/test_suite_gcm.function suites/test_suite_gcm.aes128_de.data scripts/generate_code.pl suites/helpers.function suites/main_test.function - echo " Generate $@" + echo " Gen $@" scripts/generate_code.pl suites test_suite_gcm test_suite_gcm.aes128_de test_suite_gcm.aes192_de.c : suites/test_suite_gcm.function suites/test_suite_gcm.aes192_de.data scripts/generate_code.pl suites/helpers.function suites/main_test.function - echo " Generate $@" + echo " Gen $@" scripts/generate_code.pl suites test_suite_gcm test_suite_gcm.aes192_de test_suite_gcm.aes256_de.c : suites/test_suite_gcm.function suites/test_suite_gcm.aes256_de.data scripts/generate_code.pl suites/helpers.function suites/main_test.function - echo " Generate $@" + echo " Gen $@" scripts/generate_code.pl suites test_suite_gcm test_suite_gcm.aes256_de test_suite_gcm.aes128_en.c : suites/test_suite_gcm.function suites/test_suite_gcm.aes128_en.data scripts/generate_code.pl suites/helpers.function suites/main_test.function - echo " Generate $@" + echo " Gen $@" scripts/generate_code.pl suites test_suite_gcm test_suite_gcm.aes128_en test_suite_gcm.aes192_en.c : suites/test_suite_gcm.function suites/test_suite_gcm.aes192_en.data scripts/generate_code.pl suites/helpers.function suites/main_test.function - echo " Generate $@" + echo " Gen $@" scripts/generate_code.pl suites test_suite_gcm test_suite_gcm.aes192_en test_suite_gcm.aes256_en.c : suites/test_suite_gcm.function suites/test_suite_gcm.aes256_en.data scripts/generate_code.pl suites/helpers.function suites/main_test.function - echo " Generate $@" + echo " Gen $@" scripts/generate_code.pl suites test_suite_gcm test_suite_gcm.aes256_en test_suite_gcm.camellia.c : suites/test_suite_gcm.function suites/test_suite_gcm.camellia.data scripts/generate_code.pl suites/helpers.function suites/main_test.function - echo " Generate $@" + echo " Gen $@" scripts/generate_code.pl suites test_suite_gcm test_suite_gcm.camellia test_suite_hmac_drbg.misc.c : suites/test_suite_hmac_drbg.function suites/test_suite_hmac_drbg.misc.data scripts/generate_code.pl suites/helpers.function suites/main_test.function - echo " Generate $@" + echo " Gen $@" scripts/generate_code.pl suites test_suite_hmac_drbg test_suite_hmac_drbg.misc test_suite_hmac_drbg.no_reseed.c : suites/test_suite_hmac_drbg.function suites/test_suite_hmac_drbg.no_reseed.data scripts/generate_code.pl suites/helpers.function suites/main_test.function - echo " Generate $@" + echo " Gen $@" scripts/generate_code.pl suites test_suite_hmac_drbg test_suite_hmac_drbg.no_reseed test_suite_hmac_drbg.nopr.c : suites/test_suite_hmac_drbg.function suites/test_suite_hmac_drbg.nopr.data scripts/generate_code.pl suites/helpers.function suites/main_test.function - echo " Generate $@" + echo " Gen $@" scripts/generate_code.pl suites test_suite_hmac_drbg test_suite_hmac_drbg.nopr test_suite_hmac_drbg.pr.c : suites/test_suite_hmac_drbg.function suites/test_suite_hmac_drbg.pr.data scripts/generate_code.pl suites/helpers.function suites/main_test.function - echo " Generate $@" + echo " Gen $@" scripts/generate_code.pl suites test_suite_hmac_drbg test_suite_hmac_drbg.pr %.c : suites/%.function suites/%.data scripts/generate_code.pl suites/helpers.function suites/main_test.function - echo " Generate $@" + echo " Gen $@" scripts/generate_code.pl suites $* $* test_suite_aes.ecb$(EXEXT): test_suite_aes.ecb.c $(DEP) diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index fac26805b..0562c755c 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh @@ -215,7 +215,7 @@ scripts/config.pl unset MBEDTLS_MEMORY_BUFFER_ALLOC_C # calls exit CC=arm-none-eabi-gcc AR=arm-none-eabi-ar LD=arm-none-eabi-ld CFLAGS=-Werror make lib fi # arm-gcc -if which armcc >/dev/null && armcc --help >/dev/null; then +if which armcc >/dev/null && armcc --help >/dev/null 2>&1; then msg "build: armcc, make" cleanup cp "$CONFIG_H" "$CONFIG_BAK"