From acfb1062f4c3f08cdfeb7fef496121d4f5edfc3f Mon Sep 17 00:00:00 2001 From: David Benjamin Date: Tue, 13 Jun 2023 00:11:46 -0400 Subject: [PATCH] Fix tests on Arm when NEON is unavailable I forgot a CPU capability check in X25519Test.NeonABI. Change-Id: Ie2fa4a7b04a7eb152aa3b720687ec529e5dd5b0f Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/60745 Reviewed-by: Adam Langley Auto-Submit: David Benjamin Commit-Queue: Adam Langley --- crypto/curve25519/x25519_test.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/crypto/curve25519/x25519_test.cc b/crypto/curve25519/x25519_test.cc index 8c08ee22c..c1b9e40ab 100644 --- a/crypto/curve25519/x25519_test.cc +++ b/crypto/curve25519/x25519_test.cc @@ -218,6 +218,10 @@ TEST(X25519Test, Wycheproof) { #if defined(BORINGSSL_X25519_NEON) && defined(SUPPORTS_ABI_TEST) TEST(X25519Test, NeonABI) { + if (!CRYPTO_is_NEON_capable()) { + GTEST_SKIP() << "Can't test ABI of NEON code without NEON"; + } + static const uint8_t kScalar[32] = { 0xa5, 0x46, 0xe3, 0x6b, 0xf0, 0x52, 0x7c, 0x9d, 0x3b, 0x16, 0x15, 0x4b, 0x82, 0x46, 0x5e, 0xdd, 0x62, 0x14, 0x4c, 0x0a, 0xc1, 0xfc,