mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'js/t7406-recursive-submodule-update-order-fix'

Browse Source 
Test fix.

* js/t7406-recursive-submodule-update-order-fix:
  t7406: avoid failures solely due to timing issues
This commit is contained in:
Junio C Hamano
2018-08-15 15:08:21 -07:00
parent ea30f539ef 0b7d324ee5
commit 10639c395a
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
t/t7406-submodule-update.sh
View File

@ -115,17 +115,17 @@ Submodule path '../super/submodule': checked out '$submodulesha1'
EOF EOF
cat <<EOF >expect2 cat <<EOF >expect2
Cloning into '$pwd/recursivesuper/super/merging'...
Cloning into '$pwd/recursivesuper/super/none'...
Cloning into '$pwd/recursivesuper/super/rebasing'...
Cloning into '$pwd/recursivesuper/super/submodule'...
Submodule 'merging' ($pwd/merging) registered for path '../super/merging' Submodule 'merging' ($pwd/merging) registered for path '../super/merging'
Submodule 'none' ($pwd/none) registered for path '../super/none' Submodule 'none' ($pwd/none) registered for path '../super/none'
Submodule 'rebasing' ($pwd/rebasing) registered for path '../super/rebasing' Submodule 'rebasing' ($pwd/rebasing) registered for path '../super/rebasing'
Submodule 'submodule' ($pwd/submodule) registered for path '../super/submodule' Submodule 'submodule' ($pwd/submodule) registered for path '../super/submodule'
Cloning into '$pwd/recursivesuper/super/merging'...
done. done.
Cloning into '$pwd/recursivesuper/super/none'...
done. done.
Cloning into '$pwd/recursivesuper/super/rebasing'...
done. done.
Cloning into '$pwd/recursivesuper/super/submodule'...
done. done.
EOF EOF
@ -137,7 +137,8 @@ test_expect_success 'submodule update --init --recursive from subdirectory' '
git submodule update --init --recursive ../super >../../actual 2>../../actual2 git submodule update --init --recursive ../super >../../actual 2>../../actual2
) && ) &&
test_i18ncmp expect actual && test_i18ncmp expect actual &&
test_i18ncmp expect2 actual2 sort actual2 >actual2.sorted &&
test_i18ncmp expect2 actual2.sorted
' '
cat <<EOF >expect2 cat <<EOF >expect2