From: SZEDER Gábor Date: Thu, 08 Mar 2018 21:49:50 GMT Subject: Re: [PATCH 1/2] t9400-git-cvsserver-server: don't rely on the output of 'test_cmp' Message-ID: In-Reply-To: On Thu, Mar 8, 2018 at 7:51 PM, Eric Sunshine wrote: > On Thu, Mar 8, 2018 at 7:38 AM, SZEDER Gábor wrote: >> Unroll that for loop, so we can check the files' contents the usual >> way and rely on 'test_cmp's exit code failing the && chain. Extract >> updating a file via CVS and verifying its contents using 'test_cmp' >> into a helper function requiring the file's name as parameter to avoid >> much of the repetition resulting from unrolling the loop. > > An alternative approach used elsewhere in the test suite[1] would be > simply to 'exit' if test_cmp fails: > > for i in merge no-lf empty really-empty; do > GIT_CONFIG="$git_config" cvs update -p "$i" >$i.out > test_cmp $i.out ../$i || exit 1 > done && > > (And, like the existing patch, this removes the need for capturing > test_cmp's output into a "failures" file.) > > [1]: For example, the "setup" test of t2204-add-ignored.sh. But 't/README' sayeth: Don't: - exit() within a