Hi Mimi,
> Note: Some travis/<distro>.sh scripts are links to other scripts.
> Don't fail the build of the linked script if the swtpm package doesn't
> exist.
...
> --- a/travis/fedora.sh
> +++ b/travis/fedora.sh
> @@ -41,6 +41,7 @@ yum -y install \
> which
>
> yum -y install docbook5-style-xsl || true
> +yum -y install swtpm || true
Yes, that's probably the best way how to solve.
Sometimes I also passed $INSTALL to the script and had if clause.
> On Sun, 2020-08-16 at 15:36 -0400, Mimi Zohar wrote:
> > # Only stop this test's software TPM. Preferred method: "tsstpmcmd -stop"
> > @@ -48,22 +52,36 @@ cleanup() {
> > # Try to start a software TPM if needed.
> > swtpm_start() {
> > - local swtpm
> > + local swtpm swtpm1
> > swtpm="$(which tpm_server)"
> > - if [ -z "${swtpm}" ]; then
> > - echo "${CYAN}SKIP: Softare TPM (tpm_server) not found${NORM}"
> > + swtpm1="$(which swtpm)"
> > + if [ -z "${swtpm}" ] && [ -z "${swptm1}" ]; then
> Need to fix "swptm1" typo.
+1
Reviewed-by: Petr Vorel <pvorel@xxxxxxx>
Also, not related to this commit:
* add pgrep and pkill to _require (fix of a different commit)
* add magic constant 114 to exit codes (in tests/functions.sh)
* I'd like reuse exit codes in build.sh. I could source tests/functions.sh (they
look to be general enough, just I didn't like script in root directory depending
on it, as it's general enough for build without testing) have these constants in
separate file.
Kind regards,
Petr
