diff --git a/scripts/output_env.sh b/scripts/output_env.sh index 1afaac33e..e9ad8c5d7 100755 --- a/scripts/output_env.sh +++ b/scripts/output_env.sh @@ -47,13 +47,15 @@ print_version() print_version "uname" "-a" "" echo -: ${ARMC5_CC:=armcc} -print_version "$ARMC5_CC" "--vsn" "armcc not found!" "head -n 2" -echo +if [ "${RUN_ARMCC:-1}" -ne 0 ]; then + : "${ARMC5_CC:=armcc}" + print_version "$ARMC5_CC" "--vsn" "armcc not found!" "head -n 2" + echo -: ${ARMC6_CC:=armclang} -print_version "$ARMC6_CC" "--vsn" "armclang not found!" "head -n 2" -echo + : "${ARMC6_CC:=armclang}" + print_version "$ARMC6_CC" "--vsn" "armclang not found!" "head -n 2" + echo +fi print_version "arm-none-eabi-gcc" "--version" "gcc-arm not found!" "head -n 1" echo diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index 67b22cdbd..1f8877609 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh @@ -447,7 +447,7 @@ msg "info: output_env.sh" OPENSSL="$OPENSSL" OPENSSL_LEGACY="$OPENSSL_LEGACY" GNUTLS_CLI="$GNUTLS_CLI" \ GNUTLS_SERV="$GNUTLS_SERV" GNUTLS_LEGACY_CLI="$GNUTLS_LEGACY_CLI" \ GNUTLS_LEGACY_SERV="$GNUTLS_LEGACY_SERV" ARMC5_CC="$ARMC5_CC" \ - ARMC6_CC="$ARMC6_CC" scripts/output_env.sh + ARMC6_CC="$ARMC6_CC" RUN_ARMCC="$RUN_ARMCC" scripts/output_env.sh msg "test: recursion.pl" # < 1s tests/scripts/recursion.pl library/*.c