From e2855c32b5d121efe4863782b6694761a600a848 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bence=20Sz=C3=A9pk=C3=BAti?= Date: Tue, 9 Nov 2021 17:33:57 +0100 Subject: [PATCH] Move to an updated fork of psa-arch-tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The new fork was rebased on top of the upstream master, removing the need for most of the downstream patches we carried. On the other hand, the new fork includes a couple of fixes to problems that were not addressed by the original fork, or were introduced with the new version of psa-arch-tests. Signed-off-by: Bence Szépkúti --- tests/scripts/test_psa_compliance.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/tests/scripts/test_psa_compliance.py b/tests/scripts/test_psa_compliance.py index 2f67f08c8..58cb8f1a9 100755 --- a/tests/scripts/test_psa_compliance.py +++ b/tests/scripts/test_psa_compliance.py @@ -29,10 +29,18 @@ import subprocess import sys EXPECTED_FAILURES = { - 216, 221, 224, 225, 248, 249, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263 + 221, 224, 225, 252, 253, 254, 255, 256, 257, 258, 259, 261, 262, 263 } -PSA_ARCH_TESTS_REPO = 'https://github.com/ronald-cron-arm/psa-arch-tests.git' -PSA_ARCH_TESTS_REF = 'crypto1.0-3.0' + +# We currently use a fork of ARM-software/psa-arch-tests, with a couple of downstream patches +# that allow it to build with MbedTLS 3, and fixes a couple of issues in the compliance test suite. +# These fixes allow the tests numbered 216, 248 and 249 to complete successfully. +# +# Once all the fixes are upstreamed, this fork should be replaced with an upstream commit/tag. +# +# Web URL: https://github.com/bensze01/psa-arch-tests/tree/fixes-for-mbedtls-3 +PSA_ARCH_TESTS_REPO = 'https://github.com/bensze01/psa-arch-tests.git' +PSA_ARCH_TESTS_REF = 'fixes-for-mbedtls-3' #pylint: disable=too-many-branches,too-many-statements def main():