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 <ronald.cron@arm.com>
This commit is contained in:
Ronald Cron 2024-07-22 08:56:10 +02:00
parent 0b796a42e6
commit 7262b47d79
2 changed files with 13 additions and 6 deletions

View File

@ -13,7 +13,5 @@ function wait_for_server_startup() {
done
}
$(dirname "$0")/kill_servers.sh
$(dirname "$0")/psa_server &
wait_for_server_startup

View File

@ -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