Skip to content

Compare physical paths in test data stamp and distclean rules #12066

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
julek-wolfssl wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Compare physical paths in test data stamp and distclean rules #12066

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,9 @@ TESTS += $(check_SCRIPTS)
# for an out-of-tree build it exists only in the source tree. Symlink it into
# the build tree so the tests can find it. This is driven by a stamp file in
# BUILT_SOURCES so it runs once, before anything else, for "make", "make all"
# and "make check". It is a no-op for in-tree builds.
# and "make check". It is a no-op for in-tree builds. The trees are
# compared by physical path: a symlinked source dir can make abs_top_srcdir
# and abs_top_builddir differ as strings for an in-tree build.
#
# The setup and the distclean cleanup use rm -rf: a --private-dir run of
# .github/scripts/parallel-make-check.py replaces the certs symlink with a
Expand All @@ -320,7 +322,8 @@ BUILT_SOURCES += wolfssl-test-data.stamp

wolfssl-test-data.stamp:
$(AM_V_at)set -e; \
if test "$(abs_top_srcdir)" != "$(abs_top_builddir)"; then \
if test "`cd "$(abs_top_srcdir)" && pwd -P`" != \
"`cd "$(abs_top_builddir)" && pwd -P`"; then \
$(MKDIR_P) tests scripts examples; \
for f in certs input quit; do \
rm -rf "$$f"; \
Expand Down Expand Up @@ -364,9 +367,11 @@ clean-local:
-rm -rf $(ADVISORY_OUT_DIR)

# Remove the symlinks created for out-of-tree builds. Gated on
# srcdir != builddir so an in-tree build never touches the real source files.
# physical srcdir != builddir so an in-tree build never touches the real
# source files.
distclean-local:
$(AM_V_at)if test "$(abs_top_srcdir)" != "$(abs_top_builddir)"; then \
$(AM_V_at)if test "`cd "$(abs_top_srcdir)" && pwd -P`" != \
"`cd "$(abs_top_builddir)" && pwd -P`"; then \
rm -rf certs input quit; \
rm -f tests/*.conf tests/*.cnf tests/TXT_DB.txt; \
rm -f scripts/*.pcap scripts/*.out scripts/*.sslkeylog \
Expand Down
Loading