From 44a9b170b9a654a027f5e18acddb8b2b04c3b59f Mon Sep 17 00:00:00 2001 From: Ryan Harkin Date: Tue, 12 Jan 2021 13:34:29 +0000 Subject: tpm: use local TPM binaries dip-image-dev has the binaries pre-installed. Signed-off-by: Ryan Harkin --- automated/linux/tpm/tpm.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/automated/linux/tpm/tpm.sh b/automated/linux/tpm/tpm.sh index c271fe4..2f2cc68 100755 --- a/automated/linux/tpm/tpm.sh +++ b/automated/linux/tpm/tpm.sh @@ -53,11 +53,14 @@ tpm_test() echo "test: $file success_string: ${success_string}" echo "################################################################################" - wget -q ${url}/${file} || echo "ERROR: wget ${file} failed" - if [ -e "${file}" ]; then + #wget -q ${url}/${file} || echo "ERROR: wget ${file} failed" + testscript="/usr/share/installed-tests/tpm/${file}" + if [ -e "${testscript}" ]; then rm -f /tmp/tpm.log || true - bash $file 2>&1 | tee /tmp/tpm.log + bash ${testscript} 2>&1 | tee /tmp/tpm.log grep -e "${success_string}" /tmp/tpm.log && result=pass + else + echo "ERROR: ${testscript} does not exist" fi echo "$file $result" | tee -a ${RESULT_FILE} } -- cgit v1.2.3