t/lib-commit-graph.sh: allow graph_read_expect() in sub-directories

The `graph_read_expect()` function is used to ensure that the output of
the "read-graph" test helper matches certain parameters (e.g., how many
commits are in the graph, which chunks were written, etc.).

It expects the Git repository being tested to be at the current working
directory. However, a handful of t5318 tests use different repositories
stored in sub-directories. To work around this, several tests in t5318
change into the relevant repository outside of a sub-shell, altering the
context for the rest of the suite.

Prepare to remove these globally-scoped directory changes by teaching
`graph_read_expect()` to take an optional "-C dir" to specify where the
repository containing the commit-graph being tested is.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Taylor Blau 2023-07-24 12:39:22 -04:00 committed by Junio C Hamano
parent 6016ee0a71
commit c355b64176

View File

@ -32,6 +32,13 @@ graph_git_behavior() {
graph_read_expect() { graph_read_expect() {
OPTIONAL="" OPTIONAL=""
NUM_CHUNKS=3 NUM_CHUNKS=3
DIR="."
if test "$1" = -C
then
shift
DIR="$1"
shift
fi
if test -n "$2" if test -n "$2"
then then
OPTIONAL=" $2" OPTIONAL=" $2"
@ -47,12 +54,15 @@ graph_read_expect() {
then then
OPTIONS=" read_generation_data" OPTIONS=" read_generation_data"
fi fi
cat >expect <<- EOF cat >"$DIR/expect" <<-EOF
header: 43475048 1 $(test_oid oid_version) $NUM_CHUNKS 0 header: 43475048 1 $(test_oid oid_version) $NUM_CHUNKS 0
num_commits: $1 num_commits: $1
chunks: oid_fanout oid_lookup commit_metadata$OPTIONAL chunks: oid_fanout oid_lookup commit_metadata$OPTIONAL
options:$OPTIONS options:$OPTIONS
EOF EOF
test-tool read-graph >output && (
test_cmp expect output cd "$DIR" &&
test-tool read-graph >output &&
test_cmp expect output
)
} }