From 78cbe59e64ad8cc0bf918d9e474c38e371d01235 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Mon, 9 Oct 2023 17:58:32 +0200 Subject: [PATCH] Fix startup Signed-off-by: Pol Henarejos --- tests/run-test-in-docker.sh | 9 ++------- tests/startup.sh | 3 ++- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/tests/run-test-in-docker.sh b/tests/run-test-in-docker.sh index 3589acc..de7018a 100755 --- a/tests/run-test-in-docker.sh +++ b/tests/run-test-in-docker.sh @@ -2,13 +2,8 @@ source tests/docker_env.sh -if [[ "$#" -gt 1 ]]; then - if [[ $1 == "pkcs11" ]]; then - run_in_docker ./tests/start-up-and-test-pkcs11.sh - elif [[ $1 == "pytest" ]]; then - run_in_docker ./tests/start-up-and-test.sh - fi +if [[ $1 == "pkcs11" ]]; then + run_in_docker ./tests/start-up-and-test-pkcs11.sh else run_in_docker ./tests/start-up-and-test.sh fi - diff --git a/tests/startup.sh b/tests/startup.sh index 8cc289f..a6d924f 100644 --- a/tests/startup.sh +++ b/tests/startup.sh @@ -13,8 +13,9 @@ sleep 2 rm -f memory.flash tar -xf tests/memory.tar.gz echo -n "Start Pico HSM... " -./build_in_docker/pico_hsm > /dev/null 2>&1 & +./build_in_docker/pico_hsm & test $? -eq 0 && echo -e "${OK}" || { echo -e "${FAIL}" exit 1 } +sleep 2