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

add test_cmp function for test scripts

Browse Source 
Many scripts compare actual and expected output using
"diff -u". This is nicer than "cmp" because the output shows
how the two differ. However, not all versions of diff
understand -u, leading to unnecessary test failure.

This adds a test_cmp function to the test scripts and
switches all "diff -u" invocations to use it. The function
uses the contents of "$GIT_TEST_CMP" to compare its
arguments; the default is "diff -u".

On systems with a less-capable diff, you can do:

  GIT_TEST_CMP=cmp make test

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King
2008-03-12 17:36:36 -04:00
committed by Junio C Hamano
parent b4ce54fc61
commit 82ebb0b6ec
40 changed files with 133 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
t/t9200-git-cvsexportcommit.sh
View File

@ -37,7 +37,7 @@ check_entries () {
else
printf '%s\n' "$2" | tr '|' '\012' >expected
fi
diff -u expected actual
test_cmp expected actual
}
test_expect_success \
@ -257,8 +257,8 @@ test_expect_success '-w option should work with relative GIT_DIR' '
(cd "$GIT_DIR" &&
GIT_DIR=. git cvsexportcommit -w "$CVSWORK" -c $id &&
check_entries "$CVSWORK/W" "file1.txt/1.1/|file2.txt/1.1/" &&
diff -u "$CVSWORK/W/file1.txt" ../W/file1.txt &&
diff -u "$CVSWORK/W/file2.txt" ../W/file2.txt
test_cmp "$CVSWORK/W/file1.txt" ../W/file1.txt &&
test_cmp "$CVSWORK/W/file2.txt" ../W/file2.txt
)
'
@ -279,9 +279,9 @@ test_expect_success 'check files before directories' '
git cvsexportcommit -w "$CVSWORK" -c $id &&
check_entries "$CVSWORK/E" "DS/1.1/|newfile5.txt/1.1/" &&
check_entries "$CVSWORK" "DS/1.1/|release-notes/1.2/" &&
diff -u "$CVSWORK/DS" DS &&
diff -u "$CVSWORK/E/DS" E/DS &&
diff -u "$CVSWORK/release-notes" release-notes
test_cmp "$CVSWORK/DS" DS &&
test_cmp "$CVSWORK/E/DS" E/DS &&
test_cmp "$CVSWORK/release-notes" release-notes
'
@ -293,7 +293,7 @@ test_expect_success 'commit a file with leading spaces in the name' '
id=$(git rev-parse HEAD) &&
git cvsexportcommit -w "$CVSWORK" -c $id &&
check_entries "$CVSWORK" " space/1.1/|DS/1.1/|release-notes/1.2/" &&
diff -u "$CVSWORK/ space" " space"
test_cmp "$CVSWORK/ space" " space"
'