t9402: Rename check.cvsCount and check.list
Checking and comparing the number of line in check.list and check.cvsCount had been replaced by comparing both files line by line. Rename the filenames to make clear which is expected and which is actual: check.list -> list.expected check.cvsCount-> list.actual Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Torsten Bögershausen committed
Dec 8, 2012 at 22:35 UTC
eacdd428bcc32dcb934c0e1e67ba187fb872c290
1 file changed
+6
-6
t/t9402-git-cvsserver-refs.sh
+6
-6
@@ -10,7 +10,7 @@ tags, branches and other git refspecs'
10
#########
11
12
check_start_tree() {
13
- rm -f "$WORKDIR/check.list"
13
+ rm -f "$WORKDIR/list.expected"
14
echo "start $1" >>"${WORKDIR}/check.log"
15
}
16
@@ -23,22 +23,22 @@ check_file() {
23
test_cmp "$WORKDIR/check.got" "$sandbox/$file"
24
stat=$?
25
echo "check_file $sandbox $file $ver : $stat" >>"$WORKDIR/check.log"
26
- echo "$file" >>"$WORKDIR/check.list"
26
+ echo "$file" >>"$WORKDIR/list.expected"
27
return $stat
28
}
29
30
check_end_tree() {
31
sandbox="$1" &&
32
- find "$sandbox" -name CVS -prune -o -type f -print >"$WORKDIR/check.cvsCount" &&
33
- sort <"$WORKDIR/check.list" >expected &&
34
- sort <"$WORKDIR/check.cvsCount" | sed -e "s%cvswork/%%" >actual &&
32
+ find "$sandbox" -name CVS -prune -o -type f -print >"$WORKDIR/list.actual" &&
33
+ sort <"$WORKDIR/list.expected" >expected &&
34
+ sort <"$WORKDIR/list.actual" | sed -e "s%cvswork/%%" >actual &&
35
test_cmp expected actual &&
36
rm expected actual
37
}
38
39
check_end_full_tree() {
40
sandbox="$1" &&
41
- sort <"$WORKDIR/check.list" >expected &&
41
+ sort <"$WORKDIR/list.expected" >expected &&
42
find "$sandbox" -name CVS -prune -o -type f -print | sed -e "s%$sandbox/%%" | sort >act1 &&
43
test_cmp expected act1 &&
44
git ls-tree --name-only -r "$2" | sort >act2 &&