lei.chen/myxce
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: repoint stale controller/xce_test path references to harness/xce_test

Browse source 
Follow-up to the xce-harness-component spec, which relocated xce_test
from src/controller/testsuite/ into a standalone src/harness/
component (commits cf55d691..cf380750). These four files were outside
that spec's own file boundary (owned by other specs / general tooling)
so were deliberately left alone at the time, but their hardcoded
default path and error-message advice were now stale and would have
misled anyone who hit them:

- .claude/skills/xce-build/SKILL.md: added `harness` to both component
  lists (frontmatter description + args section), and replaced the
  "controller always builds xce_test too" claim with an accurate
  description of the harness component, its own build command, and
  the accepted Meson test-runner quirk (bug-1806) that can still
  transitively rebuild xce_test as a side effect of another
  component's default-profile test run.
- src/controller/testsuite/test_rcfile_integration.sh (owned by the
  xce-test-rc-file spec): XCE_TEST_BIN default and failure message.
- src/controller/testsuite/clean_failover_preservation.sh (owned by
  ha-term-safety task 5.2): same.
- src/tools/test-commit-durability.sh: same, plus its header comment.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01RLSNJhNoULvVcUhXEFafQC
This commit is contained in:
Rongsong Shen 2026-09-14 11:49:01 +00:00
parent cf380750a3
commit cbf822fc53
No known key found for this signature in database
GPG key ID: 5BCDAAE0123E9FE2
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/controller/testsuite/clean_failover_preservation.sh
View file

@ -75,7 +75,7 @@ set -u
HERE="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
REPO_ROOT="$(cd "$HERE/../../.." && pwd)"
BINARY="${XCE_CONTROLLER_BIN:-$REPO_ROOT/src/xce.build/controller/xce_controller}"
XCE_TEST="${XCE_TEST_BIN:-$REPO_ROOT/src/xce.build/controller/xce_test}"
XCE_TEST="${XCE_TEST_BIN:-$REPO_ROOT/src/xce.build/harness/xce_test}"
DATADIR="${XCE_HA_DATADIR:-$REPO_ROOT/ha/data}"
DEPLOY_SH="${XCE_DEPLOY_SH:-$REPO_ROOT/src/tools/deploy-ha.sh}"
@ -137,7 +137,7 @@ xtest() {
# ── Preconditions ────────────────────────────────────────────────────────────
[ -x "$BINARY" ] || fail "controller binary not found/executable: $BINARY (run /xce-build controller)"
[ -x "$XCE_TEST" ] || fail "xce_test not found/executable: $XCE_TEST (run /xce-build controller)"
[ -x "$XCE_TEST" ] || fail "xce_test not found/executable: $XCE_TEST (run /xce-build harness)"
[ -r "$DATADIR/cluster.bin" ] || fail "cluster.bin missing under $DATADIR (deploy prerequisite)"
[ -r "$DATADIR/xce.crt" ] && [ -r "$DATADIR/xce.key" ] || fail "TLS certs missing under $DATADIR"
[ -x "$DEPLOY_SH" ] || fail "deploy script missing: $DEPLOY_SH"

4
src/controller/testsuite/test_rcfile_integration.sh
View file

@ -28,7 +28,7 @@ set -u
# ── Config ───────────────────────────────────────────────────────────────────
HERE="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
REPO_ROOT="$(cd "$HERE/../../.." && pwd)"
XCE_TEST="${XCE_TEST_BIN:-$REPO_ROOT/src/xce.build/controller/xce_test}"
XCE_TEST="${XCE_TEST_BIN:-$REPO_ROOT/src/xce.build/harness/xce_test}"
# xce_test's `masters` setting defaults to "localhost:9990" (test.c's
# settings[] table) and prints as "<not set>" until something actually
@ -351,7 +351,7 @@ test_rcfile_failure_continues_interactive() {
main() {
[ -x "$XCE_TEST" ] \
|| { log "FAIL: xce_test not found/executable: $XCE_TEST (run /xce-build controller)"; exit 1; }
|| { log "FAIL: xce_test not found/executable: $XCE_TEST (run /xce-build harness)"; exit 1; }
test_rcfile_takes_effect_piped
test_rcfile_takes_effect_interactive

4
src/tools/test-commit-durability.sh
View file

@ -80,7 +80,7 @@
# reports RED (no primary fdatasync precedes the ack). After the fix it must
# go GREEN. See run_deterministic() below.
#
# Requires a current build: run /xce-build controller first.
# Requires a current build: run /xce-build controller and /xce-build harness first.
set -u
# ── mode selection ────────────────────────────────────────────────────────────
@ -94,7 +94,7 @@ fi
WORKTREE=$(cd "$(dirname "$0")/../.." && pwd)
BINARY="$WORKTREE/src/xce.build/controller/xce_controller"
XCE_TEST="$WORKTREE/src/xce.build/controller/xce_test"
XCE_TEST="$WORKTREE/src/xce.build/harness/xce_test"
DEPLOY_DIR="${1:-/tmp/xce-ha-deploy}"
ROUNDS="${2:-8}"
PEERS="localhost:9991,localhost:9992,localhost:9993"