[sane-devel] [PATCH] testsuite: update versions in html baselines

Olaf Meeuwissen paddy-hack at member.fsf.org
Sun Nov 8 09:24:13 UTC 2015

Hi Mike,

Mike Frysinger writes:

> On 04 Nov 2015 17:48, Olaf Meeuwissen wrote:
>> Thanks for the patch but what is this trying to fix?
> using the 1.0.25 release:
> $ make check
> ...
> Making check in tools
> make[2]: Entering directory '/usr/local/src/sane-backends/sane-backends-1.0.25/testsuite/tools'
> **** Testing ../../tools/sane-desc with ./data/testfile.desc
> PASS: sane-desc -m ascii -s ./data
> PASS: sane-desc -m html-backends-split -s ./data
> 16499,16500c16499,16500
> < This page was last updated on Wed Jul 31 07:52:48 2013
> <  by sane-desc 3.5 from sane-backends 1.0.24git
> ---
>> This page was last updated on Wed Nov  4 13:00:10 2015
>>  by sane-desc 3.5 from sane-backends 1.0.25
> **** File generated for html-backends-split mode is different from reference
> Makefile:505: recipe for target 'check.local' failed
> make[2]: *** [check.local] Error 1

OK, I got your point.
This is reproducible with 60a772c (aka RELEASE_1_0_25).

>> When I run a make check on current head (33495ef) none of the tests in
>> testsuite/tools/ fails.  Also, there is a commit (febae63a) that means
>> to handle version number changes.
>>   $ make -C testsuite/tools check
> that commit might help with git trees, but the releases are all broken.
> i guess my patch doesn't fix that, but the code is broken none the less.

I have just pushed a fix (d7516a1) for the test logic that should
address this.  I now checks for an optional "git" at end of line.

I also tightened down the timestamp check and made the for-loop print a
FAIL: message in case of a failure.  I was confused by the PASS: message
when a test actually failed ;-)

Thanks for pointing this out.

Hope this helps,
Olaf Meeuwissen, LPIC-2            FSF Associate Member since 2004-01-27
Support Free Software               Support the Free Software Foundation
https://my.fsf.org/donate                        https://my.fsf.org/join
 GnuPG key: F84A2DD9/B3C0 2F47 EA19 64F4 9F13  F43E B8A4 A88A F84A 2DD9

More information about the sane-devel mailing list