diff options
| author | Tomi Ollila <tomi.ollila@iki.fi> | 2016-10-09 23:36:07 +0300 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2016-10-25 18:13:29 -0300 |
| commit | 8a82ad716f807f8ba1e39269ad169dccd4a15ade (patch) | |
| tree | b4ec576d5d50f95f7023ff593959fad49386e905 | |
| parent | 8128c7b5aad880e572b9ca4ee509f776bcb3e901 (diff) | |
test/test-lib.sh: execute basename(1)s lazier in test_expect_equal_file ()
Moved the 2 basename(1) executions to the test failure branch in
test_expect_equal_file ().
The output of basename(1) executions in function test_expect_equal_file ()
are only used when tests fails -- when all tests pass these 2 basename(1)
executions are no longer done at all.
| -rw-r--r-- | test/test-lib.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/test-lib.sh b/test/test-lib.sh index e7b83392..a12c6d0a 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -624,15 +624,15 @@ test_expect_equal_file () error "bug in the test script: not 2 or 3 parameters to test_expect_equal" file1="$1" - basename1=`basename "$file1"` file2="$2" - basename2=`basename "$file2"` 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")" |