Merge branch 'es/test-cmp-typocatcher'

[thirdparty/git.git] / t / test-lib-functions.sh

diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index 8d59b90348ea898ca983e8bbd0742de495a8d36d..4a35bde145cc71073a74e2e53d35f32447de4c6c 100644 (file)
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -952,13 +952,7 @@ test_expect_code () {
 # - not all diff versions understand "-u"
 
 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
+       eval "$GIT_TEST_CMP" '"$@"'
 }
 
 # Check that the given config key has the expected value.
@@ -987,13 +981,7 @@ test_cmp_config() {
 # test_cmp_bin - helper to compare binary files
 
 test_cmp_bin() {
-       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
+       cmp "$@"
 }
 
 # Use this instead of test_cmp to compare files that contain expected and