X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=test%2Ftest-lib.sh;h=dc2972f256a00456b0649911b56719586f553ddd;hp=7fed29ccaa21128258e33fd4626d474f6f56decc;hb=b596fbbcd30c82a6487231f01ba1e4d68bd98275;hpb=d92146d3a6809f8ad940302af49cd99a0820665e diff --git a/test/test-lib.sh b/test/test-lib.sh index 7fed29cc..dc2972f2 100755 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -441,6 +441,29 @@ test_expect_equal () fi } +test_expect_equal_file () +{ + exec 1>&6 2>&7 # Restore stdout and stderr + inside_subtest= + test "$#" = 3 && { prereq=$1; shift; } || prereq= + test "$#" = 2 || + error "bug in the test script: not 2 or 3 parameters to test_expect_equal" + + output="$1" + expected="$2" + if ! test_skip "$@" + then + if diff -q "$expected" "$output" >/dev/null ; then + test_ok_ "$test_subtest_name" + else + testname=$this_test.$test_count + mv "$output" $testname.output + mv "$expected" $testname.expected + test_failure_ "$test_subtest_name" "$(diff -u $testname.expected $testname.output)" + fi + fi +} + test_expect_equal_failure () { exec 1>&6 2>&7 # Restore stdout and stderr