lava-expect: fix successes strings in interactive actions
Fixes some wrongly placed successes strings and instead use only
prompts for better readability. Also, fix and re-phrase some
paragraphs in the readme section for better understanding.
Signed-off-by: Leonardo Sandoval <leonardo.sandoval@linaro.org>
Change-Id: Ia4a8f0a771d23d45f77778d3bfa1b28cc9051d34
diff --git a/lava-expect/linux-tpm.exp b/lava-expect/linux-tpm.exp
index 27adf92..54e026f 100644
--- a/lava-expect/linux-tpm.exp
+++ b/lava-expect/linux-tpm.exp
@@ -14,15 +14,17 @@
expect_string+=('m;Booting Trusted Firmware;Booting BL31;Digest(\s|\w)*:\s(\w{2}\s){16}@: (\w{2}\s){16}@Event(\s|\w)*:\s\w+\s')
# Wait for the login prompt
-expect_string+=('i;buildroot login:')
+expect_string+=("i;buildroot login:")
-# Load the fTPM driver and retrieves PCR0
+# Login then load the fTPM driver and retrieves PCR0
# Pass condition: PCR0 must not be all zeros.
-expect_string+=("i;#;${non_zero_pcr};;root@ftpm")
+expect_string+=("i;#;;;root")
+expect_string+=("i;${non_zero_pcr};;;ftpm")
# Iterate over the rest of PCRs and check that they all are zeros.
zero_pcr="(\s00){16}\s+(00\s){16}"
for i in $(seq 1 11); do
- expect_string+=("i;#;${zero_pcr};;pcrread -ha $i")
+ expect_string+=("i;#")
+ expect_string+=("i;${zero_pcr};;;pcrread -ha $i")
done