On Mittwoch, 18. März 2009, Johannes Sixt wrote: > I'm preparing a series of patches that adjust the test suite so that it > passes on Windows (MinGW port). This is the initial part of it. Another > dozen or more are to follow. By splitting the series I hope to get > earlier feedback. > > The series is also available from > > git://repo.or.cz/git/mingw/j6t.git for-junio > > http://repo.or.cz/w/git/mingw/j6t.git?a=shortlog;h=refs/heads/for-junio I've updated the series. Would you please pick up it up from the URL above? The changes in particular are: - [PATCH 02/10] test suite: Use 'say' to say something instead of... Updated commit message. - [PATCH 04/10] test-lib: Replace uses of $(expr ...) by POSIX... No changes to t4013 and t5515 anymore; the next patch removes the lines that this patch touched. - [PATCH 05/10] test-lib: Simplify test counting. Do not use $test_count+1 in t4013 and t5515. - [PATCH 08/10] t2200, t7004: Avoid glob pattern that also... Added path2 to the list. Below is the interdiff. -- Hannes diff --git a/t/t2200-add-update.sh b/t/t2200-add-update.sh index 652801e..5a8d52f 100755 --- a/t/t2200-add-update.sh +++ b/t/t2200-add-update.sh @@ -150,7 +150,7 @@ test_expect_success 'add -u resolves unmerged paths' ' echo 2 >path3 && echo 2 >path5 && git add -u && - git ls-files -s path1 path3 path4 path5 path6 >actual && + git ls-files -s path1 path2 path3 path4 path5 path6 >actual && { echo "100644 $three 0 path1" echo "100644 $one 1 path3" diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index 9c30b29..426e64e 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -101,8 +101,7 @@ do '' | '#'*) continue ;; esac test=`echo "$cmd" | sed -e 's|[/ ][/ ]*|_|g'` - cnt=$(($test_count+1)) - pfx=`printf "%04d" $cnt` + pfx=`printf "%04d" $test_count` expect="$TEST_DIRECTORY/t4013/diff.$test" actual="$pfx-diff.$test" diff --git a/t/t5515-fetch-merge-logic.sh b/t/t5515-fetch-merge-logic.sh index 0b39503..dbb927d 100755 --- a/t/t5515-fetch-merge-logic.sh +++ b/t/t5515-fetch-merge-logic.sh @@ -129,8 +129,7 @@ do '' | '#'*) continue ;; esac test=`echo "$cmd" | sed -e 's|[/ ][/ ]*|_|g'` - cnt=$(($test_count+1)) - pfx=`printf "%04d" $cnt` + pfx=`printf "%04d" $test_count` expect_f="$TEST_DIRECTORY/t5515/fetch.$test" actual_f="$pfx-fetch.$test" expect_r="$TEST_DIRECTORY/t5515/refs.$test" -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
