From 86d5706182fda3c53c34d2ad9403087fbcaf1568 Mon Sep 17 00:00:00 2001 From: jochen Date: Sat, 17 Oct 2026 21:32:23 +0200 Subject: [PATCH] Run the integration-tagged tests in the merge check, before any test carries the tag (issue 895) --- merge-check.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/merge-check.sh b/merge-check.sh index a466457d..45d4a1ec 100755 --- a/merge-check.sh +++ b/merge-check.sh @@ -17,7 +17,8 @@ # toolchain has a C compiler. A requirement of the mesh's own forge the module cache does not hold (a # pinned SDK commit) is taken from its repository's clone beside the check (checks/deps); a module whose # dependencies still cannot be had **fails the check**, by name and why — its tests could not run, and a -# test that could not run is a failure, never a note (novox/hq issue 385). A module written in +# test that could not run is a failure, never a note (novox/hq issue 385). The integration tests (`//go:build +# integration`) run here, with -tags integration, and only here. A module written in # TypeScript is type-checked and tested by # merge-check-typescript.sh, declared above, in the TypeScript toolchain (novox/hq issues 302, 311); # 3. the words (novox/hq ADR 0244): no word the glossary retired for the tools, as copied in @@ -183,8 +184,10 @@ for m in $touched; do fi cgo=0 [ -n "$race" ] && cgo=1 - (cd "modules/$m" && CGO_ENABLED=$cgo GOPRIVATE=git.novox.be go vet ${modfile:+"-modfile=$modfile"} ./... && - CGO_ENABLED=$cgo GOPRIVATE=git.novox.be go test ${modfile:+"-modfile=$modfile"} $race -count=1 ./...) + # The integration tests (a file whose first line is `//go:build integration`: a test that starts a bus, a store or + # another process) run here and nowhere else: the unit suite stays under a second (novox/hq playbook 07). + (cd "modules/$m" && CGO_ENABLED=$cgo GOPRIVATE=git.novox.be go vet -tags integration ${modfile:+"-modfile=$modfile"} ./... && + CGO_ENABLED=$cgo GOPRIVATE=git.novox.be go test -tags integration ${modfile:+"-modfile=$modfile"} $race -count=1 ./...) done if [ -n "$untestable" ]; then echo "the check fails: the tests of$untestable could not run (novox/hq issue 385)" -- 2.54.0