diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-08-17 17:02:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-17 17:02:47 -0700 |
| commit | 07f14d31abeb00437c2e5d3f6074d56582957e1d (patch) | |
| tree | aa081a3b7465e1458a2c7726b66b8d63e148d86d /t/test-lib-functions.sh | |
| parent | Merge branch 'rp/apply-cached-with-i-t-a' (diff) | |
| parent | test_cmp: diagnose incorrect arguments (diff) | |
| download | git-07f14d31abeb00437c2e5d3f6074d56582957e1d.tar.gz git-07f14d31abeb00437c2e5d3f6074d56582957e1d.zip | |
Merge branch 'es/test-cmp-typocatcher'
Test framework update.
* es/test-cmp-typocatcher:
test_cmp: diagnose incorrect arguments
Diffstat (limited to 't/test-lib-functions.sh')
| -rw-r--r-- | t/test-lib-functions.sh | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index 596c549cdd..6a8e194a99 100644 --- a/t/test-lib-functions.sh +++ b/t/test-lib-functions.sh @@ -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 |