diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-11-02 13:17:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-02 13:17:38 -0800 |
| commit | d5c2d1a0aad8ef59c83d801e6cf378dc8b312f8b (patch) | |
| tree | 313d88c875df02a33d69ce209d718ff1aadf7467 | |
| parent | cd47bbe1644d461dd166a46b905b602a8881ef41 (diff) | |
| parent | 262d5ad5a56005e4f21612f195ca183626b2f9ac (diff) | |
| download | git-d5c2d1a0aad8ef59c83d801e6cf378dc8b312f8b.tar.gz | |
Merge branch 'es/test-cmp-typocatcher'
A test helper "test_cmp A B" was taught to diagnose missing files A
or B as a bug in test, but some tests legitimately wanted to notice
a failure to even create file B as an error, in addition to leaving
the expected result in it, and were misdiagnosed as a bug. This
has been corrected.
* es/test-cmp-typocatcher:
Revert "test_cmp: diagnose incorrect arguments"
| -rw-r--r-- | t/test-lib-functions.sh | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index 8d59b90348..4a35bde145 100644 --- 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 |