Merge branch 'ea/blame-use-oideq'

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

diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index 596c549cdd58debb5bc4e41bebce57f86f69d8b7..f9904066feed6d609d8d568dbd16080957ed7aa3 100644 (file)
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -820,7 +820,7 @@ test_must_fail_acceptable () {
        fi
 
        case "$1" in
-       git|__git*|test-tool|test-svn-fe|test_terminal)
+       git|__git*|test-tool|test_terminal)
                return 0
                ;;
        *)
@@ -952,7 +952,13 @@ test_expect_code () {
 # - not all diff versions understand "-u"
 
 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.
@@ -981,7 +987,13 @@ test_cmp_config() {
 # test_cmp_bin - helper to compare binary files
 
 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