debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2025-03-18 21:45:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

test/test-lib.sh: execute basename(1)s lazier in test_expect_equal_file ()

Browse source 
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.
This commit is contained in:
Tomi Ollila 2016-10-09 23:36:07 +03:00 • committed by David Bremner
parent 8128c7b5aa
commit 8a82ad716f
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/test-lib.sh
View file

@ -624,15 +624,15 @@ test_expect_equal_file ()
error "bug in the test script: not 2 or 3 parameters to test_expect_equal" error "bug in the test script: not 2 or 3 parameters to test_expect_equal"
file1="$1" file1="$1"
basename1=`basename "$file1"`
file2="$2" file2="$2"
basename2=`basename "$file2"`
if ! test_skip "$test_subtest_name" if ! test_skip "$test_subtest_name"
then then
if diff -q "$file1" "$file2" >/dev/null ; then if diff -q "$file1" "$file2" >/dev/null ; then
test_ok_ test_ok_
else else
testname=$this_test.$test_count testname=$this_test.$test_count
basename1=`basename "$file1"`
basename2=`basename "$file2"`
cp "$file1" "$testname.$basename1" cp "$file1" "$testname.$basename1"
cp "$file2" "$testname.$basename2" cp "$file2" "$testname.$basename2"
test_failure_ "$(diff -u "$testname.$basename1" "$testname.$basename2")" test_failure_ "$(diff -u "$testname.$basename1" "$testname.$basename2")"