diff options
| author | David Bremner <david@tethera.net> | 2021-08-04 07:42:30 -0300 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2021-08-21 14:51:04 -0700 |
| commit | f2e6f311c7b4bf4c459c7e73c8a8d3fe157851c4 (patch) | |
| tree | 393f05ed36bf7833a3050b4b034c506584a69b85 | |
| parent | be6edee49660308131cbc7a6eb51e38c642cc098 (diff) | |
test/expect_equal_file: whitespace cleanup
No functional change, just reindent to Emacs defaults.
| -rw-r--r-- | test/test-lib.sh | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/test/test-lib.sh b/test/test-lib.sh index 1dbc6f7f..1f696c44 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -404,29 +404,29 @@ test_expect_equal () { # Like test_expect_equal, but takes two filenames. test_expect_equal_file () { - local file1 file2 testname basename1 basename2 - exec 1>&6 2>&7 # Restore stdout and stderr - if [ -z "$inside_subtest" ]; then - error "bug in the test script: test_expect_equal_file without test_begin_subtest" - fi - inside_subtest= - test "$#" = 2 || + local file1 file2 testname basename1 basename2 + exec 1>&6 2>&7 # Restore stdout and stderr + if [ -z "$inside_subtest" ]; then + error "bug in the test script: test_expect_equal_file without test_begin_subtest" + fi + inside_subtest= + test "$#" = 2 || error "bug in the test script: not 2 parameters to test_expect_equal_file" - file1="$1" - file2="$2" - if ! test_skip "$test_subtest_name" - then - if diff -q "$file1" "$file2" >/dev/null ; then - test_ok_ - else - testname=$this_test.$test_count - basename1=`basename "$file1"` - basename2=`basename "$file2"` - cp "$file1" "$testname.$basename1" - cp "$file2" "$testname.$basename2" - test_failure_ "$(diff -u "$testname.$basename1" "$testname.$basename2")" - fi + file1="$1" + file2="$2" + if ! test_skip "$test_subtest_name" + then + if diff -q "$file1" "$file2" >/dev/null ; then + test_ok_ + else + testname=$this_test.$test_count + basename1=`basename "$file1"` + basename2=`basename "$file2"` + cp "$file1" "$testname.$basename1" + cp "$file2" "$testname.$basename2" + test_failure_ "$(diff -u "$testname.$basename1" "$testname.$basename2")" + fi fi } |