Add tests to populate the working tree during clone and checkout using
the sequential and parallel modes, to confirm that they produce
identical results. Also test basic checkout mechanics, such as checking
for symlinks in the leading directories and the abidance to --force.
Note: some helper functions are added to a common lib file which is only
included by t2080 for now. But it will also be used by other
parallel-checkout tests in the following patches.
Original-patch-by: Jeff Hostetler <jeffhost@xxxxxxxxxxxxx>
Signed-off-by: Jeff Hostetler <jeffhost@xxxxxxxxxxxxx>
Signed-off-by: Matheus Tavares <matheus.bernardino@xxxxxx>
---
t/lib-parallel-checkout.sh | 40 +++++++
t/t2080-parallel-checkout-basics.sh | 170 ++++++++++++++++++++++++++++
2 files changed, 210 insertions(+)
create mode 100644 t/lib-parallel-checkout.sh
create mode 100755 t/t2080-parallel-checkout-basics.sh
diff --git a/t/lib-parallel-checkout.sh b/t/lib-parallel-checkout.sh
new file mode 100644
index 0000000000..4dad9043fb
--- /dev/null
+++ b/t/lib-parallel-checkout.sh
@@ -0,0 +1,40 @@
+# Helpers for t208* tests
+
+# Runs `git -c checkout.workers=$1 -c checkout.thesholdForParallelism=$2 ${@:4}`
+# and checks that the number of workers spawned is equal to $3.
+#
+git_pc()
+{
+ if test $# -lt 4
+ then
+ BUG "too few arguments to git_pc()"
+ fi &&
+
+ workers=$1 threshold=$2 expected_workers=$3 &&
+ shift 3 &&
+
+ rm -f trace &&
+ GIT_TRACE2="$(pwd)/trace" git \
+ -c checkout.workers=$workers \
+ -c checkout.thresholdForParallelism=$threshold \
+ -c advice.detachedHead=0 \
+ "$@" &&
+
+ # Check that the expected number of workers has been used. Note that it
+ # can be different from the requested number in two cases: when the
+ # threshold is not reached; and when there are not enough
+ # parallel-eligible entries for all workers.
+ #
+ local workers_in_trace=$(grep "child_start\[..*\] git checkout--helper" trace | wc -l) &&
+ test $workers_in_trace -eq $expected_workers &&
+ rm -f trace
+}
+
+# Verify that both the working tree and the index were created correctly
+verify_checkout()
+{
+ git -C "$1" diff-index --quiet HEAD -- &&
+ git -C "$1" diff-index --quiet --cached HEAD -- &&
+ git -C "$1" status --porcelain >"$1".status &&
+ test_must_be_empty "$1".status
+}
diff --git a/t/t2080-parallel-checkout-basics.sh b/t/t2080-parallel-checkout-basics.sh
new file mode 100755
index 0000000000..edea88f14f
--- /dev/null
+++ b/t/t2080-parallel-checkout-basics.sh
@@ -0,0 +1,170 @@
+#!/bin/sh
+
+test_description='parallel-checkout basics
+
+Ensure that parallel-checkout basically works on clone and checkout, spawning
+the required number of workers and correctly populating both the index and
+working tree.
+'
+
+TEST_NO_CREATE_REPO=1
+. ./test-lib.sh
+. "$TEST_DIRECTORY/lib-parallel-checkout.sh"
+
+# Test parallel-checkout with different operations (creation, deletion,
+# modification) and entry types. A branch switch from B1 to B2 will contain:
+#
+# - a (file): modified
+# - e/x (file): deleted
+# - b (symlink): deleted
+# - b/f (file): created
+# - e (symlink): created
+# - d (submodule): created
+#
+test_expect_success SYMLINKS 'setup repo for checkout with various operations' '
+ git init various &&
+ (
+ cd various &&
+ git checkout -b B1 &&
+ echo a>a &&
+ mkdir e &&
+ echo e/x >e/x &&
+ ln -s e b &&
+ git add -A &&
+ git commit -m B1 &&
+
+ git checkout -b B2 &&
+ echo modified >a &&
+ rm -rf e &&
+ rm b &&
+ mkdir b &&
+ echo b/f >b/f &&
+ ln -s b e &&
+ git init d &&
+ test_commit -C d f &&
+ git submodule add ./d &&
+ git add -A &&
+ git commit -m B2 &&
+
+ git checkout --recurse-submodules B1
+ )
+'
+
+test_expect_success SYMLINKS 'sequential checkout' '
+ cp -R various various_sequential &&
+ git_pc 1 0 0 -C various_sequential checkout --recurse-submodules B2 &&
+ verify_checkout various_sequential
+'
+
+test_expect_success SYMLINKS 'parallel checkout' '
+ cp -R various various_parallel &&
+ git_pc 2 0 2 -C various_parallel checkout --recurse-submodules B2 &&
+ verify_checkout various_parallel
+'
+
+test_expect_success SYMLINKS 'fallback to sequential checkout (threshold)' '
+ cp -R various various_sequential_fallback &&
+ git_pc 2 100 0 -C various_sequential_fallback checkout --recurse-submodules B2 &&
+ verify_checkout various_sequential_fallback
+'
+
+test_expect_success SYMLINKS 'parallel checkout on clone' '
+ git -C various checkout --recurse-submodules B2 &&
+ git_pc 2 0 2 clone --recurse-submodules various various_parallel_clone &&
+ verify_checkout various_parallel_clone
+'
+
+test_expect_success SYMLINKS 'fallback to sequential checkout on clone (threshold)' '
+ git -C various checkout --recurse-submodules B2 &&
+ git_pc 2 100 0 clone --recurse-submodules various various_sequential_fallback_clone &&
+ verify_checkout various_sequential_fallback_clone
+'
+
+# Just to be paranoid, actually compare the working trees' contents directly.
+test_expect_success SYMLINKS 'compare the working trees' '
+ rm -rf various_*/.git &&
+ rm -rf various_*/d/.git &&
+
+ diff -r various_sequential various_parallel &&
+ diff -r various_sequential various_sequential_fallback &&
+ diff -r various_sequential various_parallel_clone &&
+ diff -r various_sequential various_sequential_fallback_clone
+'
+
+test_cmp_str()
+{
+ echo "$1" >tmp &&
+ test_cmp tmp "$2"
+}
+
+test_expect_success 'parallel checkout respects --[no]-force' '
+ git init dirty &&
+ (
+ cd dirty &&
+ mkdir D &&
+ test_commit D/F &&
+ test_commit F &&
+
+ echo changed >F.t &&
+ rm -rf D &&
+ echo changed >D &&
+
+ # We expect 0 workers because there is nothing to be updated
+ git_pc 2 0 0 checkout HEAD &&
+ test_path_is_file D &&
+ test_cmp_str changed D &&
+ test_cmp_str changed F.t &&
+
+ git_pc 2 0 2 checkout --force HEAD &&
+ test_path_is_dir D &&
+ test_cmp_str D/F D/F.t &&
+ test_cmp_str F F.t
+ )
+'
+
+test_expect_success SYMLINKS 'parallel checkout checks for symlinks in leading dirs' '
+ git init symlinks &&
+ (
+ cd symlinks &&
+ mkdir D E &&
+
+ # Create two entries in D to have enough work for 2 parallel
+ # workers
+ test_commit D/A &&
+ test_commit D/B &&
+ test_commit E/C &&
+ rm -rf D &&
+ ln -s E D &&
+
+ git_pc 2 0 2 checkout --force HEAD &&
+ ! test -L D &&
+ test_cmp_str D/A D/A.t &&
+ test_cmp_str D/B D/B.t
+ )
+'
+
+test_expect_success SYMLINKS,CASE_INSENSITIVE_FS 'symlink colliding with leading dir' '
+ git init colliding-symlink &&
+ (
+ cd colliding-symlink &&
+ file_hex=$(git hash-object -w --stdin </dev/null) &&
+ file_oct=$(echo $file_hex | hex2oct) &&
+
+ sym_hex=$(echo "./D" | git hash-object -w --stdin) &&
+ sym_oct=$(echo $sym_hex | hex2oct) &&
+
+ printf "100644 D/A\0${file_oct}" >tree &&
+ printf "100644 E/B\0${file_oct}" >>tree &&
+ printf "120000 e\0${sym_oct}" >>tree &&
+
+ tree_hex=$(git hash-object -w -t tree --stdin <tree) &&
+ commit_hex=$(git commit-tree -m collisions $tree_hex) &&
+ git update-ref refs/heads/colliding-symlink $commit_hex &&
+
+ git_pc 2 0 2 checkout colliding-symlink &&
+ test_path_is_dir D &&
+ test_path_is_missing D/B
+ )
+'
+
+test_done
--
2.28.0
