diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/pkits/common.sh | 2 | ||||
| -rw-r--r-- | tests/tpm2dtests/Makefile.am | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/pkits/common.sh b/tests/pkits/common.sh index 697f28f67..1f9293ecc 100644 --- a/tests/pkits/common.sh +++ b/tests/pkits/common.sh @@ -189,7 +189,7 @@ final_result () { [ $fail_count = 0 ] || info "$fail_count tests failed" [ $skip_count = 0 ] || info "$unsupported_count tests skipped" [ $unresolved_count = 0 ] || info "$unresolved_count tests unresolved" - [ -z "$debug" -a -f "$SCRATCH" ] && rm "$SCRATCH" + [ -z "$debug" ] && [ -f "$SCRATCH" ] && rm "$SCRATCH" if [ $fail_count = 0 ]; then info "all tests passed" else diff --git a/tests/tpm2dtests/Makefile.am b/tests/tpm2dtests/Makefile.am index ceaf56420..6eab563f1 100644 --- a/tests/tpm2dtests/Makefile.am +++ b/tests/tpm2dtests/Makefile.am @@ -60,7 +60,7 @@ xcheck: tpm_server_found $(abs_srcdir)/run-tests.scm $(TESTFLAGS) $(TESTS) tpm_server_found: - @if [ -z "$(TPMSERVER)" -a -z "$(SWTPM)" -a -z "$(FORCE)" ]; then echo "ERROR: No Software TPM has been found, cannot run TPM tests. Set FORCE=1 to force using the physical TPM"; exit 1; fi + @if [ -z "$(TPMSERVER)" ] && [ -z "$(SWTPM)" ] && [ -z "$(FORCE)" ]; then echo "ERROR: No Software TPM has been found, cannot run TPM tests. Set FORCE=1 to force using the physical TPM"; exit 1; fi EXTRA_DIST = defs.scm shell.scm all-tests.scm run-tests.scm $(XTESTS) \ start_sw_tpm.sh setup.scm |