t7508: .gitignore 'expect' and 'output' files

These files are used to observe the behaviour of the 'status'
command and if there weren't any such observer, the expected
output from 'status' wouldn't even mention them.

Place them in .gitignore to unclutter the output expected by the
tests.  An added benefit is that future tests can add such files
that are purely for use by the observer, i.e. the tests themselves,
by naming them as expect-foo and/or output-bar.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2015-03-06 10:43:33 +01:00
parent 9874fca712
commit ec8a896eb5

View File

@ -66,6 +66,12 @@ strip_comments () {
rm "$1" && mv "$1".tmp "$1" rm "$1" && mv "$1".tmp "$1"
} }
cat >.gitignore <<\EOF
.gitignore
expect*
output*
EOF
test_expect_success 'status --column' ' test_expect_success 'status --column' '
cat >expect <<\EOF && cat >expect <<\EOF &&
# On branch master # On branch master
@ -83,8 +89,8 @@ test_expect_success 'status --column' '
# Untracked files: # Untracked files:
# (use "git add <file>..." to include in what will be committed) # (use "git add <file>..." to include in what will be committed)
# #
# dir1/untracked dir2/untracked output # dir1/untracked dir2/untracked
# dir2/modified expect untracked # dir2/modified untracked
# #
EOF EOF
COLUMNS=50 git -c status.displayCommentPrefix=true status --column="column dense" >output && COLUMNS=50 git -c status.displayCommentPrefix=true status --column="column dense" >output &&
@ -116,8 +122,6 @@ cat >expect <<\EOF
# dir1/untracked # dir1/untracked
# dir2/modified # dir2/modified
# dir2/untracked # dir2/untracked
# expect
# output
# untracked # untracked
# #
EOF EOF
@ -167,8 +171,6 @@ Untracked files:
dir1/untracked dir1/untracked
dir2/modified dir2/modified
dir2/untracked dir2/untracked
expect
output
untracked untracked
EOF EOF
@ -186,8 +188,6 @@ A dir2/added
?? dir1/untracked ?? dir1/untracked
?? dir2/modified ?? dir2/modified
?? dir2/untracked ?? dir2/untracked
?? expect
?? output
?? untracked ?? untracked
EOF EOF
@ -320,7 +320,11 @@ EOF
test_i18ncmp expect output test_i18ncmp expect output
' '
rm -f .gitignore cat >.gitignore <<\EOF
.gitignore
expect*
output*
EOF
cat >expect <<\EOF cat >expect <<\EOF
## master ## master
@ -329,8 +333,6 @@ A dir2/added
?? dir1/untracked ?? dir1/untracked
?? dir2/modified ?? dir2/modified
?? dir2/untracked ?? dir2/untracked
?? expect
?? output
?? untracked ?? untracked
EOF EOF
@ -434,8 +436,6 @@ Untracked files:
dir2/modified dir2/modified
dir2/untracked dir2/untracked
dir3/ dir3/
expect
output
untracked untracked
EOF EOF
@ -456,8 +456,6 @@ A dir2/added
?? dir2/modified ?? dir2/modified
?? dir2/untracked ?? dir2/untracked
?? dir3/ ?? dir3/
?? expect
?? output
?? untracked ?? untracked
EOF EOF
test_expect_success 'status -s -unormal' ' test_expect_success 'status -s -unormal' '
@ -493,8 +491,6 @@ Untracked files:
dir2/untracked dir2/untracked
dir3/untracked1 dir3/untracked1
dir3/untracked2 dir3/untracked2
expect
output
untracked untracked
EOF EOF
@ -518,8 +514,6 @@ A dir2/added
?? dir1/untracked ?? dir1/untracked
?? dir2/modified ?? dir2/modified
?? dir2/untracked ?? dir2/untracked
?? expect
?? output
?? untracked ?? untracked
EOF EOF
test_expect_success 'status -s -uall' ' test_expect_success 'status -s -uall' '
@ -554,8 +548,6 @@ Untracked files:
untracked untracked
../dir2/modified ../dir2/modified
../dir2/untracked ../dir2/untracked
../expect
../output
../untracked ../untracked
EOF EOF
@ -569,8 +561,6 @@ A ../dir2/added
?? untracked ?? untracked
?? ../dir2/modified ?? ../dir2/modified
?? ../dir2/untracked ?? ../dir2/untracked
?? ../expect
?? ../output
?? ../untracked ?? ../untracked
EOF EOF
test_expect_success 'status -s with relative paths' ' test_expect_success 'status -s with relative paths' '
@ -586,8 +576,6 @@ A dir2/added
?? dir1/untracked ?? dir1/untracked
?? dir2/modified ?? dir2/modified
?? dir2/untracked ?? dir2/untracked
?? expect
?? output
?? untracked ?? untracked
EOF EOF
@ -625,8 +613,6 @@ Untracked files:
<BLUE>dir1/untracked<RESET> <BLUE>dir1/untracked<RESET>
<BLUE>dir2/modified<RESET> <BLUE>dir2/modified<RESET>
<BLUE>dir2/untracked<RESET> <BLUE>dir2/untracked<RESET>
<BLUE>expect<RESET>
<BLUE>output<RESET>
<BLUE>untracked<RESET> <BLUE>untracked<RESET>
EOF EOF
@ -647,8 +633,6 @@ cat >expect <<\EOF
<BLUE>??<RESET> dir1/untracked <BLUE>??<RESET> dir1/untracked
<BLUE>??<RESET> dir2/modified <BLUE>??<RESET> dir2/modified
<BLUE>??<RESET> dir2/untracked <BLUE>??<RESET> dir2/untracked
<BLUE>??<RESET> expect
<BLUE>??<RESET> output
<BLUE>??<RESET> untracked <BLUE>??<RESET> untracked
EOF EOF
@ -676,8 +660,6 @@ cat >expect <<\EOF
<BLUE>??<RESET> dir1/untracked <BLUE>??<RESET> dir1/untracked
<BLUE>??<RESET> dir2/modified <BLUE>??<RESET> dir2/modified
<BLUE>??<RESET> dir2/untracked <BLUE>??<RESET> dir2/untracked
<BLUE>??<RESET> expect
<BLUE>??<RESET> output
<BLUE>??<RESET> untracked <BLUE>??<RESET> untracked
EOF EOF
@ -694,8 +676,6 @@ A dir2/added
?? dir1/untracked ?? dir1/untracked
?? dir2/modified ?? dir2/modified
?? dir2/untracked ?? dir2/untracked
?? expect
?? output
?? untracked ?? untracked
EOF EOF
@ -755,8 +735,6 @@ Untracked files:
dir1/untracked dir1/untracked
dir2/modified dir2/modified
dir2/untracked dir2/untracked
expect
output
untracked untracked
EOF EOF
@ -772,8 +750,6 @@ A dir2/added
?? dir1/untracked ?? dir1/untracked
?? dir2/modified ?? dir2/modified
?? dir2/untracked ?? dir2/untracked
?? expect
?? output
?? untracked ?? untracked
EOF EOF
@ -798,8 +774,6 @@ Untracked files:
dir1/untracked dir1/untracked
dir2/ dir2/
expect
output
untracked untracked
EOF EOF
@ -848,8 +822,6 @@ Untracked files:
dir1/untracked dir1/untracked
dir2/modified dir2/modified
dir2/untracked dir2/untracked
expect
output
untracked untracked
EOF EOF
@ -870,8 +842,6 @@ A sm
?? dir1/untracked ?? dir1/untracked
?? dir2/modified ?? dir2/modified
?? dir2/untracked ?? dir2/untracked
?? expect
?? output
?? untracked ?? untracked
EOF EOF
test_expect_success 'status -s submodule summary is disabled by default' ' test_expect_success 'status -s submodule summary is disabled by default' '
@ -913,8 +883,6 @@ Untracked files:
dir1/untracked dir1/untracked
dir2/modified dir2/modified
dir2/untracked dir2/untracked
expect
output
untracked untracked
EOF EOF
@ -940,8 +908,6 @@ A sm
?? dir1/untracked ?? dir1/untracked
?? dir2/modified ?? dir2/modified
?? dir2/untracked ?? dir2/untracked
?? expect
?? output
?? untracked ?? untracked
EOF EOF
test_expect_success 'status -s submodule summary' ' test_expect_success 'status -s submodule summary' '
@ -964,8 +930,6 @@ Untracked files:
dir1/untracked dir1/untracked
dir2/modified dir2/modified
dir2/untracked dir2/untracked
expect
output
untracked untracked
no changes added to commit (use "git add" and/or "git commit -a") no changes added to commit (use "git add" and/or "git commit -a")
@ -983,8 +947,6 @@ cat >expect <<EOF
?? dir1/untracked ?? dir1/untracked
?? dir2/modified ?? dir2/modified
?? dir2/untracked ?? dir2/untracked
?? expect
?? output
?? untracked ?? untracked
EOF EOF
test_expect_success 'status -s submodule summary (clean submodule)' ' test_expect_success 'status -s submodule summary (clean submodule)' '
@ -1025,8 +987,6 @@ Untracked files:
dir1/untracked dir1/untracked
dir2/modified dir2/modified
dir2/untracked dir2/untracked
expect
output
untracked untracked
EOF EOF
@ -1080,8 +1040,6 @@ Untracked files:
dir1/untracked dir1/untracked
dir2/modified dir2/modified
dir2/untracked dir2/untracked
expect
output
untracked untracked
EOF EOF
@ -1192,8 +1150,6 @@ Untracked files:
dir1/untracked dir1/untracked
dir2/modified dir2/modified
dir2/untracked dir2/untracked
expect
output
untracked untracked
EOF EOF
@ -1254,8 +1210,6 @@ Untracked files:
dir1/untracked dir1/untracked
dir2/modified dir2/modified
dir2/untracked dir2/untracked
expect
output
untracked untracked
EOF EOF
@ -1336,8 +1290,6 @@ cat > expect << EOF
; dir1/untracked ; dir1/untracked
; dir2/modified ; dir2/modified
; dir2/untracked ; dir2/untracked
; expect
; output
; untracked ; untracked
; ;
EOF EOF
@ -1369,8 +1321,6 @@ Untracked files:
dir1/untracked dir1/untracked
dir2/modified dir2/modified
dir2/untracked dir2/untracked
expect
output
untracked untracked
no changes added to commit (use "git add" and/or "git commit -a") no changes added to commit (use "git add" and/or "git commit -a")
@ -1400,8 +1350,6 @@ Untracked files:
dir1/untracked dir1/untracked
dir2/modified dir2/modified
dir2/untracked dir2/untracked
expect
output
untracked untracked
EOF EOF