]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Fix: cannot stat tests/STUB.h No such file or directory (#707)
authorAmos Jeffries <yadij@users.noreply.github.com>
Thu, 6 Aug 2020 22:49:34 +0000 (22:49 +0000)
committerAmos Jeffries <yadij@users.noreply.github.com>
Sun, 9 Aug 2020 18:06:11 +0000 (06:06 +1200)
Since 2b5ebbe (PR #670), we have been seeing "random" build failures.

The tests/Stub.am generated by source-maintenance.sh has not included
the tests/STUB.h file for explicit distribution. The source file was
built and included only when seen as a dependency of the files using it.

When stubs are copied for use by the extra binaries from tools/
directory, there is a secondary side effect from "make -j":

* When the -j concurrency is small, tests/STUB.h gets copied during the
  first cycle, and parallel builds compiling other copied files succeed.

* When the -j concurrency is large, tests/STUB.h may be deferred to a
  later copy cycle, and the first actual compile task needing it fails
  with `cannot stat 'src/tests/STUB.h': No such file or directory`.

Add tests/STUB.h to src/Makefile.am EXTRA_DIST to restore the previous
distribution behavior (when STUB_SOURCE contained it explicitly).

Update the pinger source paths that were omitted in 2b5ebbe.

src/Makefile.am
src/icmp/Makefile.am

index 7b3a1a66a83c611f0545142cf5fe3afb67f86cdb..a9bd7446018b2d85fbd7adc9b587ab6f481c26e8 100644 (file)
@@ -730,6 +730,7 @@ EXTRA_DIST = \
        mk-string-arrays.awk \
        repl_modules.sh \
        $(STUB_SOURCE) \
+       tests/STUB.h \
        mib.txt \
        mime.conf.default
 
index a5edcb54cd68e94575e279ac87d39a05a0ed5c19..539e91262b090416aacc2dc646acef12835c211c 100644 (file)
@@ -40,11 +40,11 @@ COPIED_SOURCE= \
        globals.cc \
        SquidConfig.cc \
        SquidNew.cc \
-       stub_fd.cc \
-       stub_HelperChildConfig.cc \
-       stub_libmem.cc \
-       stub_SBuf.cc \
-       STUB.h \
+       tests/stub_fd.cc \
+       tests/stub_HelperChildConfig.cc \
+       tests/stub_libmem.cc \
+       tests/stub_SBuf.cc \
+       tests/STUB.h \
        time.cc
 
 # ICMP lookup helper
@@ -99,17 +99,17 @@ SquidConfig.cc: $(top_srcdir)/src/SquidConfig.cc
 SquidNew.cc: $(top_srcdir)/src/SquidNew.cc
        cp $(top_srcdir)/src/SquidNew.cc $@
 
-stub_HelperChildConfig.cc: $(top_srcdir)/src/tests/stub_HelperChildConfig.cc
+tests/stub_HelperChildConfig.cc: $(top_srcdir)/src/tests/stub_HelperChildConfig.cc
        cp $(top_srcdir)/src/tests/stub_HelperChildConfig.cc $@
 
-stub_fd.cc: $(top_srcdir)/src/tests/stub_fd.cc STUB.h
+tests/stub_fd.cc: $(top_srcdir)/src/tests/stub_fd.cc
        cp $(top_srcdir)/src/tests/stub_fd.cc $@
 
-stub_libmem.cc: $(top_srcdir)/src/tests/stub_libmem.cc STUB.h
+tests/stub_libmem.cc: $(top_srcdir)/src/tests/stub_libmem.cc
        cp $(top_srcdir)/src/tests/stub_libmem.cc $@
 
-stub_SBuf.cc: $(top_srcdir)/src/tests/stub_SBuf.cc STUB.h
+tests/stub_SBuf.cc: $(top_srcdir)/src/tests/stub_SBuf.cc
        cp $(top_srcdir)/src/tests/stub_SBuf.cc $@
 
-STUB.h: $(top_srcdir)/src/tests/STUB.h
+tests/STUB.h: $(top_srcdir)/src/tests/STUB.h
        cp $(top_srcdir)/src/tests/STUB.h $@