Improve test harness code introduced during sidecar migration - #283
Merged
Conversation
![cubic-dev-ai[bot]](https://avatars.githubusercontent.com/in/1082092?s=60&v=4){kind=small}
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
henrybear327
force-pushed
the
sysroot/test-harness
branch
from
August 11, 2026 15:25
1140d67 to
5746f38
Compare
henrybear327
marked this pull request as draft
August 11, 2026 15:41
henrybear327
force-pushed
the
sysroot/test-harness
branch
from
August 11, 2026 15:41
5746f38 to
8ffca7c
Compare
henrybear327
marked this pull request as ready for review
August 11, 2026 15:42
src/syscall/sidecar.c was deleted in the casefold redesign, but three pieces of prose still cite it: an internals paragraph explaining the climbed-create rule by comparison to sidecar_walk_parent_at(), and two test headers describing sidecar collapsing and sidecar-mangled names. The paragraph drops the comparison, and each test header states the behavior that actually holds: the resolvers clamp '..' only at the guest root, and a case-insensitive sysroot may store a leaf under its escaped spelling. A citation that resolves to no file misleads the reader who tries to follow it.
henrybear327
force-pushed
the
sysroot/test-harness
branch
from
August 11, 2026 19:43
8ffca7c to
f012e26
Compare
The guest cross rules compiled and linked in one step with no dependency output, so editing a shared test header rebuilt nothing and every guest binary kept running its stale code; host tests were covered by DEPFLAGS all along. One shared flag spelling now emits a .d beside each binary, which mk/common.mk already includes. In a compile-and-link step the gcc driver injects -MQ with the -o argument, so -MMD alone names the binary as the rule target and writes the .d next to it. The dynamic-glibc bench keeps its own line: it includes no shared header, and the shared spelling's -static would defeat the dynamic link its measurement exists to exercise.
The stored-name probe used getattrlistat's reply without validating it. Every field it consumed comes from the filesystem, and a sysroot can name an SMB or NFS mount, which need not fill attr_dataoffset and attr_length the way APFS does: a reply too short for the reference, a negative offset, a length past what the volume wrote, or a name with no terminating NUL each made the "%s" print read bytes the kernel never set. Zeroing the buffer bounds what a partial reply can print. The check mirrors casefold_attr_stored_name in casefold-walk.c rather than calling it: of the three lanes including this header, only test-casefold-walk-host links casefold-walk.o.
The suite carried the same code several times over: five private helpers re-implementing test-util.h functions their own files already include, the openat2 ABI declared in two headers that each claimed to be its only home, a pathname-socket bind helper under two names and a third spelling without the listen, a pass/fail harness copied into three host binaries, and a whole lane that was another lane's assertions with different banner strings. Each moves to the header that already serves its siblings, keeping every assertion and every matrix column; the duplicated lane becomes a mode argument to the binary it was copied from. test-util.h gains the dirfd-relative siblings the name-relative lane was hand-rolling. Two details of the shared spellings are deliberate: unix_bind unlinks the socket file when listen fails, which no copy did, so a rerun does not inherit EADDRINUSE from a bind the failed call left behind; and the scratch-root helper takes the lane name as an argument, keeping the failure line each copy printed under its own name, the only name a CI log can trace back to a lane.
check and check-sanitizer spelled forty-six lanes as banner-plus-invoke pairs by hand, thirteen of them twice, and seventeen lane recipes opened with the same three lines of scratch-directory setup. Two canned recipes now carry each banner beside its invoke, and three fragments carry the shared setup and the absock leak check, so a lane-list edit cannot leave a banner naming the wrong lane. Order and banner text are preserved verbatim; recipes that clean up more than the scratch directory replace the trap once the extra paths are named. The lane recipe is a single line marked '+'. Make decides what still runs under -n by looking for a literal $(MAKE) in the unexpanded recipe line, which a canned recipe hides, so without the marker a dry run prints the sub-make instead of expanding the lane behind it. One line rather than a banner-then-invoke pair because once a '+' line appears in an expansion, every later line of that same expansion also runs for real under -n; split banners would behave unlike each other, and a non-lane line appended after a run-lane call would execute during a dry build.
henrybear327
force-pushed
the
sysroot/test-harness
branch
from
August 11, 2026 22:45
f012e26 to
83aa927
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Follow up improvement effort to improve code introduce in #256
Mainly focusing on improving the test harness makefile, and refactoring the helper functions.
Summary by cubic
Modernizes the test harness by generating check lanes with canned make rules, centralizing shared helpers, and adding header dependency tracking for guest tests. This reduces duplication, fixes rebuild correctness, and removes stale sidecar references.
Refactors
mk/tests.mk(shared scratch setup, absock leak check, banners preserved; single '+' run line so make -n expands the lane).CROSS_TEST_CFLAGS(-MMD/-MP; driver injects -MQ for the -o target).tests/test-util.handtests/host-test-util.h(dirfd file I/O, dir scans, UNIX socket helpers with cleanup on failure, host pass/fail summary; unify openat2 ABI vialinux-openat2.h); update tests to use them.test-sysroot-outside-namesvia a mode arg; removetests/test-nosysroot-literal-names.c.Bug Fixes
Written for commit 83aa927. Summary will update on new commits.