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

Merge branch 'es/test-cmp-typocatcher'

Browse Source 
Test framework update.

* es/test-cmp-typocatcher:
  test_cmp: diagnose incorrect arguments
This commit is contained in:
Junio C Hamano
2020-08-17 17:02:47 -07:00
parent ca81676a10 d572f52a64
commit 07f14d31ab
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
t/test-lib-functions.sh
View File

@ -952,7 +952,13 @@ test_expect_code () {
# - not all diff versions understand "-u" # - not all diff versions understand "-u"
test_cmp() { test_cmp() {
eval "$GIT_TEST_CMP" '"$@"' test $# -eq 2 || BUG "test_cmp requires two arguments"
if ! eval "$GIT_TEST_CMP" '"$@"'
then
test "x$1" = x- || test -e "$1" || BUG "test_cmp '$1' missing"
test "x$2" = x- || test -e "$2" || BUG "test_cmp '$2' missing"
return 1
fi
} }
# Check that the given config key has the expected value. # Check that the given config key has the expected value.
@ -981,7 +987,13 @@ test_cmp_config() {
# test_cmp_bin - helper to compare binary files # test_cmp_bin - helper to compare binary files
test_cmp_bin() { test_cmp_bin() {
cmp "$@" test $# -eq 2 || BUG "test_cmp_bin requires two arguments"
if ! cmp "$@"
then
test "x$1" = x- || test -e "$1" || BUG "test_cmp_bin '$1' missing"
test "x$2" = x- || test -e "$2" || BUG "test_cmp_bin '$2' missing"
return 1
fi
} }
# Use this instead of test_cmp to compare files that contain expected and # Use this instead of test_cmp to compare files that contain expected and