Skip to content

Commit

Permalink
cirrus ci: Fix race condition in make distcheck
Browse files Browse the repository at this point in the history
The removing of the ca files is added to clean-local and
distclean-local in Makefile.am
The deletion in clean-hook and uninstall-local is removed.
"make -j check" is used instead of "make -j distcheck".

Signed-off-by: Juergen Repp <juergen_repp@web.de>
  • Loading branch information
JuergenReppSIT committed Jan 17, 2024
1 parent 3aa1e49 commit a09960f
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ task:
script:
./bootstrap &&
./configure --enable-self-generated-certificate --enable-unit=yes --enable-integration=yes --with-crypto=ossl --disable-doxygen-doc --enable-tcti-swtpm=no --enable-tcti-libtpms=no --enable-tcti-mssim=yes --disable-dependency-tracking &&
gmake -j distcheck || { cat /tmp/cirrus-ci-build/tpm2-tss-*/_build/sub/test-suite.log; exit 1; }
gmake -j check || { cat /tmp/cirrus-ci-build/tpm2-tss-*/_build/sub/test-suite.log; exit 1; }
16 changes: 11 additions & 5 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,16 @@ GITIGNOREFILES = ""
if AUTOCONF_CODE_COVERAGE_2019_01_06
include $(top_srcdir)/aminclude_static.am
clean-local: code-coverage-clean
-rm -r -f $(top_builddir)/ca
distclean-local: code-coverage-dist-clean
-rm -r -f $(top_builddir)/ca
else
@CODE_COVERAGE_RULES@
clean-local:
-rm -r -f $(top_builddir)/ca
distclean-local:
-rm -r -f $(top_builddir)/ca

endif
GITIGNOREFILES += $(TSS_GITIGNOREFILES)
CODE_COVERAGE_DIRECTORY = $(top_builddir)/src $(top_builddir)/test
Expand Down Expand Up @@ -990,15 +997,11 @@ install-data-hook: install-dirs
fi

uninstall-local:
-rm -r -f $(top_builddir)/ca
-rm $(DESTDIR)$(udevrulesdir)/$(udevrulesprefix)tpm-udev.rules
cd $(DESTDIR)$(man3dir) && \
[ -L Tss2_TctiLdr_Initialize_Ex.3 ] && \
rm -f Tss2_TctiLdr_Initialize_Ex.3 || true

clean-hook:
-rm -r -f $(top_builddir)/ca

prepare-check:
if INIT_CA
$(top_srcdir)/script/ekca/init_ca.sh $(top_builddir)
Expand Down Expand Up @@ -1037,7 +1040,10 @@ EXTRA_DIST += \

CLEANFILES += \
$(man3_MANS) \
$(man7_MANS)
$(man7_MANS) \
$(top_builddir)/ca

DISTCLEANFILES += $(top_builddir)/ca

# function to transform man .in files to man pages
# $1: target
Expand Down

0 comments on commit a09960f

Please sign in to comment.