Make robot-test reuse artifacts and iterate quickly
Pull the .deb + ASan-nginx rebuild out of `make robot-test` — a full
dpkg-buildpackage + nginx recompile before every test run was turning
a 15-second test loop into a multi-minute one, which hurts when
iterating on a flaky suite. robot-test now fails fast with an
actionable message if either artifact is missing:
Bootstrap once: make pkg-deb build-asan
Then iterate: make robot-test # reuses both
install-deps grew to cover what a truly minimal Debian box needs —
`build-essential`, `ca-certificates`, and an explicit check that
`deb-src` is enabled (required by `apt source nginx`, which both
fetch-nginx-src and build-asan rely on). `nginx-dev` transitively
brings in the nginx build-deps (libpcre2-dev, libssl-dev, libxslt1-dev,
libgeoip-dev, libperl-dev, libexpat-dev, libgd-dev, zlib1g-dev,
debhelper-compat, po-debconf) so those stay off the explicit list.
debian/rules' override_dh_clean now pre-clears
build/nginx-asan/{fastcgi,proxy,scgi,uwsgi,client_body}_temp before
running dh_clean. Those dirs get chowned to "nobody" when the 02-asan
robot suite bind-mounts build/nginx-asan/ RW into its container and
nginx master startup creates them — subsequent pkg-deb runs were
dying with EACCES from dh_clean's find traversal. rm -rf only needs
write access to the parent (which we have), so this is safe.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
23
debian/rules
vendored
23
debian/rules
vendored
@@ -39,8 +39,23 @@ override_dh_auto_clean:
|
||||
|
||||
override_dh_clean:
|
||||
# `dh_clean` recurses from the package root to remove junk files
|
||||
# (editor backups, autom4te caches, etc.). `make build-asan`
|
||||
# produces build/nginx-asan/{fastcgi,proxy,scgi,uwsgi}_temp owned
|
||||
# by "nobody" with mode 0700, which the current user can't
|
||||
# traverse — so we exclude anything under build/ from dh_clean.
|
||||
# (editor backups, autom4te caches, etc.). Two obstacles under
|
||||
# build/:
|
||||
# 1. `make build-asan` produces build/nginx-asan/{fastcgi,proxy,
|
||||
# scgi,uwsgi,client_body}_temp owned by "nobody" with mode
|
||||
# 0700 after the ASan nginx has been run (the 02-asan robot
|
||||
# suite bind-mounts build/nginx-asan/ RW into a container,
|
||||
# and nginx chowns its temp dirs on master startup). The
|
||||
# current user can't traverse them, which makes dh_clean's
|
||||
# `find` abort with EACCES.
|
||||
# 2. We don't want to delete anything under build/ anyway — it
|
||||
# holds the ASan build artifacts from a prior `make build-asan`.
|
||||
# Clear the unreadable temp dirs first (rm -rf only needs write
|
||||
# access to the parent, which we have), then tell dh_clean to
|
||||
# exclude build/ entirely.
|
||||
rm -rf $(CURDIR)/build/nginx-asan/client_body_temp \
|
||||
$(CURDIR)/build/nginx-asan/fastcgi_temp \
|
||||
$(CURDIR)/build/nginx-asan/proxy_temp \
|
||||
$(CURDIR)/build/nginx-asan/scgi_temp \
|
||||
$(CURDIR)/build/nginx-asan/uwsgi_temp
|
||||
dh_clean -X build/
|
||||
|
||||
Reference in New Issue
Block a user