зеркало из https://github.com/microsoft/git.git
t3000 (ls-files -o): modernize style
This script is part of the second batch of tests, from the same day the test infrastructure was added to git. Update it to use a more modern style in the spirit of v1.6.4-rc0~45^2~2 (2009-05-22). In particular: - Put setup code inside test assertions, to avoid unexpected breakages and avoid stray output without -v (as t/README recommends); and - Put the test title on the same line as the "test_expect_success", and end the line with a single-quote to begin the body of the test which is one multi-line string. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
9918285fb1
Коммит
bcefed419a
|
@ -17,57 +17,52 @@ filesystem.
|
|||
'
|
||||
. ./test-lib.sh
|
||||
|
||||
date >path0
|
||||
if test_have_prereq SYMLINKS
|
||||
then
|
||||
ln -s xyzzy path1
|
||||
else
|
||||
date > path1
|
||||
fi
|
||||
mkdir path2 path3 path4
|
||||
date >path2/file2
|
||||
date >path2-junk
|
||||
date >path3/file3
|
||||
date >path3-junk
|
||||
git update-index --add path3-junk path3/file3
|
||||
test_expect_success 'setup ' '
|
||||
date >path0 &&
|
||||
if test_have_prereq SYMLINKS
|
||||
then
|
||||
ln -s xyzzy path1
|
||||
else
|
||||
date >path1
|
||||
fi &&
|
||||
mkdir path2 path3 path4 &&
|
||||
date >path2/file2 &&
|
||||
date >path2-junk &&
|
||||
date >path3/file3 &&
|
||||
date >path3-junk &&
|
||||
git update-index --add path3-junk path3/file3
|
||||
'
|
||||
|
||||
cat >expected1 <<EOF
|
||||
expected1
|
||||
expected2
|
||||
expected3
|
||||
output
|
||||
path0
|
||||
path1
|
||||
path2-junk
|
||||
path2/file2
|
||||
EOF
|
||||
sed -e 's|path2/file2|path2/|' <expected1 >expected2
|
||||
cat <expected2 >expected3
|
||||
echo path4/ >>expected2
|
||||
test_expect_success 'setup: expected output' '
|
||||
cat >expected1 <<-\EOF &&
|
||||
expected1
|
||||
expected2
|
||||
expected3
|
||||
output
|
||||
path0
|
||||
path1
|
||||
path2-junk
|
||||
path2/file2
|
||||
EOF
|
||||
|
||||
test_expect_success \
|
||||
'git ls-files --others to show output.' \
|
||||
'git ls-files --others >output'
|
||||
sed -e "s|path2/file2|path2/|" <expected1 >expected2 &&
|
||||
cp expected2 expected3 &&
|
||||
echo path4/ >>expected2
|
||||
'
|
||||
|
||||
test_expect_success \
|
||||
'git ls-files --others should pick up symlinks.' \
|
||||
'test_cmp expected1 output'
|
||||
test_expect_success 'ls-files --others' '
|
||||
git ls-files --others >output &&
|
||||
test_cmp expected1 output
|
||||
'
|
||||
|
||||
test_expect_success \
|
||||
'git ls-files --others --directory to show output.' \
|
||||
'git ls-files --others --directory >output'
|
||||
test_expect_success 'ls-files --others --directory' '
|
||||
git ls-files --others --directory >output &&
|
||||
test_cmp expected2 output
|
||||
'
|
||||
|
||||
|
||||
test_expect_success \
|
||||
'git ls-files --others --directory should not get confused.' \
|
||||
'test_cmp expected2 output'
|
||||
|
||||
test_expect_success \
|
||||
'git ls-files --others --directory --no-empty-directory to show output.' \
|
||||
'git ls-files --others --directory --no-empty-directory >output'
|
||||
|
||||
test_expect_success \
|
||||
'--no-empty-directory hides empty directory' \
|
||||
'test_cmp expected3 output'
|
||||
test_expect_success '--no-empty-directory hides empty directory' '
|
||||
git ls-files --others --directory --no-empty-directory >output &&
|
||||
test_cmp expected3 output
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
Загрузка…
Ссылка в новой задаче