From 7262b47d794571db31f64309dd93846657e36155 Mon Sep 17 00:00:00 2001 From: Ronald Cron Date: Mon, 22 Jul 2024 08:56:10 +0200 Subject: [PATCH] all.sh: psasim: Start server in tf-psa-crypto/tests Start a server in tf-psa-crypto/tests in addition to tests to be able to run test suites from tf-psa-crypto/tests. Signed-off-by: Ronald Cron --- .../psasim/test/start_server.sh | 2 -- tests/scripts/all.sh | 17 +++++++++++++---- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/tests/psa-client-server/psasim/test/start_server.sh b/tests/psa-client-server/psasim/test/start_server.sh index ed5d965b50..ef11439777 100755 --- a/tests/psa-client-server/psasim/test/start_server.sh +++ b/tests/psa-client-server/psasim/test/start_server.sh @@ -13,7 +13,5 @@ function wait_for_server_startup() { done } -$(dirname "$0")/kill_servers.sh - $(dirname "$0")/psa_server & wait_for_server_startup diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index 4ff538aea2..7c89a51f03 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh @@ -1098,16 +1098,24 @@ helper_psasim_server() { if [ "$OPERATION" == "start" ]; then ( cd tests - msg "start server" + msg "start server in tests" psa-client-server/psasim/test/start_server.sh + msg "start server in tf-psa-crypto/tests" + cd ../tf-psa-crypto/tests + ../../tests/psa-client-server/psasim/test/start_server.sh ) else ( - cd tests - msg "terminate server and cleanup" - psa-client-server/psasim//test/kill_servers.sh + msg "terminate servers and cleanup" + tests/psa-client-server/psasim//test/kill_servers.sh # Remove temporary files and logs + cd tests + rm -f psa_notify_* + rm -f psa_service_* + rm -f psa_server.log + + cd ../tf-psa-crypto/tests rm -f psa_notify_* rm -f psa_service_* rm -f psa_server.log @@ -6099,6 +6107,7 @@ component_test_suite_with_psasim() msg "build test suites" make PSASIM=1 CFLAGS="$ASAN_CFLAGS" LDFLAGS="$ASAN_CFLAGS" tests + helper_psasim_server kill helper_psasim_server start # psasim takes an extremely long execution time on some test suites so we