From 122295e2970f9e6a92b4113cdd868d175c0793fa Mon Sep 17 00:00:00 2001 From: Henning Geinitz Date: Thu, 5 Jan 2006 18:52:22 +0000 Subject: [PATCH] Changed testsuite to use the test backend instead of the pnm backend. This actually works with current sane-backends. --- ChangeLog | 3 +++ testsuite/Makefile.in | 32 +++++++++++++++++++++----------- testsuite/README | 7 +++++-- testsuite/testfile.pnm | Bin 8276 -> 9161 bytes 4 files changed, 29 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index ef5168fa1..8a856e309 100644 --- a/ChangeLog +++ b/ChangeLog @@ -61,6 +61,9 @@ the files and directories of sane-backends. Fixed building instructions for tstbackend. Mentioned that sane_* symbols should be only used for API symbols. + * testsuite/Makefile.in testsuite/README testsuite/testfile.pnm: + Changed testsuite to use the test backend instead of the pnm + backend. This actually works with current sane-backends. 2006-01-03 Henning Meier-Geinitz diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in index 3daee39b8..15ebfb368 100644 --- a/testsuite/Makefile.in +++ b/testsuite/Makefile.in @@ -35,8 +35,9 @@ RANLIB = @RANLIB@ SCANIMAGE = ../frontend/scanimage TESTFILE = testfile.pnm -DEVICE = pnm:0 -OPTIONS = --filename=$(TESTFILE) +OUTFILE = outfile.pnm +DEVICE = test +OPTIONS = --mode Color --depth 16 --test-picture "Color pattern" --resolution 50 -y 20 -x 20 > $(OUTFILE) DISTCLEAN_FILES = @DISTCLEAN_FILES@ @@ -50,16 +51,24 @@ all: Makefile test: Makefile test.local test.local: - @echo "Testing $(SCANIMAGE) with device $(DEVICE)" - @if echo "Trying flatbed scanner" && \ - $(SCANIMAGE) -d $(DEVICE) $(OPTIONS) -T && \ - echo "Trying three pass flatbed scanner" && \ - $(SCANIMAGE) -d $(DEVICE) $(OPTIONS) --three-pass=yes -T && \ - echo "Trying hand scanner" && \ - $(SCANIMAGE) -d $(DEVICE) $(OPTIONS) --hand-scanner=yes -T ; \ - then echo ; echo ; echo "All tests passed" ; \ + @echo "**** Testing $(SCANIMAGE) with device $(DEVICE)" + @if echo "---> Trying flatbed scanner" && \ + $(SCANIMAGE) -d $(DEVICE) -T && \ + echo "<--- Flatbed scanner succeded" && \ + echo "---> Trying three pass flatbed scanner" && \ + $(SCANIMAGE) -d $(DEVICE) --mode Color --three-pass=yes -T && \ + echo "<--- Three pass scanner succeded" && \ + echo "---> Trying hand scanner" && \ + $(SCANIMAGE) -d $(DEVICE) --hand-scanner=yes -T && \ + echo "<--- Hand scanner succeded" && \ + echo "---> Checking 16 bit color mode" && \ + $(SCANIMAGE) -d $(DEVICE) $(OPTIONS) && \ + cmp -s $(TESTFILE) $(OUTFILE) && \ + echo "<--- 16 bit color mode succeded" && \ + rm $(OUTFILE) ; \ + then echo ; echo ; echo "**** All tests passed" ; \ else echo ; echo; \ - echo "Something failed (maybe pnm backend not enabled by configure?)";\ + echo "**** Something failed (maybe test backend not enabled by configure?)";\ fi # Generate new Makefile when something changes @@ -68,6 +77,7 @@ Makefile: Makefile.in ../config.status && CONFIG_FILES=testsuite/Makefile CONFIG_HEADERS= /bin/sh ./config.status clean: + rm -f $(OUTFILE) distclean: clean rm -f $(DISTCLEAN_FILES) diff --git a/testsuite/README b/testsuite/README index 792d16131..dbd32ed3b 100644 --- a/testsuite/README +++ b/testsuite/README @@ -8,5 +8,8 @@ everything without installing, to make sure a new distribution is function properly before the old one is replaced. If it isn't, please fix the bug. :-) -The current test needs the pnm backend. Hint: -"configure --enable-pnm-backend". +The current tests use the test backend to scan in flatbed, hand scanner and +three pass mode. Also a 16 bit color image is created and compared to the +"right" one. This test should detect any little/big endian issues in scanimage. + + diff --git a/testsuite/testfile.pnm b/testsuite/testfile.pnm index 13ad03aae2d254653091a8ee65f5fc06eabe3145..ba3db43ca27e437f9560b1b7b93cadb4ed412a05 100644 GIT binary patch literal 9161 zcmeI%$qK{P8GzAPvNg}LCd<~;M+gaI*+sXdQ2GFY(p8{~7W(=vXYU6nM2oZkBwM=o zzkm5T`@`|qKmPeo$KQYb_pir4{`uQ)|NPItvLAmre*7i-`KO9F=oP)8FLmaS+QormK}ROIdJ5}nG0WB`R0ckcOE=>@oT9Ed1JtkcRm;~X2O&i za~3RFv1Y@T9eX}GaOA|93twFM=7$@19z1#RYpEaWjR8a6`C!DD2~%dwS+Hcqnhjfa z?D^!tkrQVwd~xNQA8y=v@Z`m>rT&mN1`K)UgArpUOqnrf!IBkgHf-6k=aU0RPMo>$ z#g%V#d>4Fkas>9F=oP)8FLmaS+QormK}ROIdJ5}nG0WB`R0ckcOE=>@oTA%$Bh9) z-uYm}myPYE_`w2n;&l6dGO@LucbbaHwFxO=YtVrCQO+z zXTg#cYc_1zvFDQmM^2o%@WqvHezs%77%^tTlo@jtELpK;!0jQ8+RT&dGTwh#oUbnL*Dsd#Fz=XD)nk<(nUF+dFO)>VBzZ*|F!714mArx$wo6Z+^IO=fRT~zm{5*-xx6D zoexHgnJ{I>oCQl(tl6+-$DU6P96533!WUP*`QgT$2Txx7T598QW5AGiJ{U1(!ju_v z7A#q@X2X^pdpr3N}T1`K)UgArpUOqnrf z!IBkgHf-6k=aU0RPMo>$#g%V9F=oP)8FLmaS+QormK}ROIdJ5}nG0WB z`R0ckcOE=>@oTB!yPYE_`w2n;&l6dGO@L zucZd8HwFxO=YtVrCQO+zXTg#cYc_1zvFDQmM^2o%@WqvHezs%77%^tTlo@jt zELpK;!0jQ8+RT&dGTwh!+;wDhP?B^h%pnU%$T!a$%-`_w(QvR z$$=v$&RqE7$~QmUxbxu2i(g9}c-$B;?9F Ou6*;ujXMvXy!c-i3;B5f literal 8276 zcmdVeAyZ^W6a`>Q@hf6+fvQa^e*u+3#_|&)u`7|0*vOGc?30lzu_Ggq-GBX z?#`}^$(S)u6U^K>!yN2#wOU+9>w%gd{)D+bXR^z>9yoCVYSY)R7ZPhWe+CJdu2G@+HjZ+nIC2zlcb`N0{Q(taA$ zmj>C?W9Wr+iE@^1`X!g%;b|pgEEVG+K0wLEz$W9tsWcW$6RnxGlPkfXK%O`uP9xDg zXhhIBkJ0X4{}Qw%p3Ko1$>_wxKW2Z{-ucD46Yy?dB|42Dx^pEo$VmI-a+lIF3{|T^ zelT)znk}=p^s#rQVQ%9{QfzahKjU-fpa2s5o8ue&FKpRkNNNRm&=_RFtW#Cs(zo#*)-9JJ3qBldX{NYA7!^FhWI~zyJJg zlxVc!U7OsT=UP)R9;cJ1JIj)#4BG+faKXrhxd3Gdh3$omFz@|Qo(qtXH=9GujhZP& zQpJ~UZlg~7MQgtc=5_Y35`-{P*vQ75yM&5u*u@i`Fhr9^*uRk>jpC;yyd~#6n`QoJpAQaO_JrAM8D zZ946D2ABeoBG)Ml@jzw^<{S`CAzK1A^9Vs2AE{O4(y21YW$4lHE%~s%^_hKFS~k)8 zE4oCpSN(J-#Wa%k&Cw?fewVI`Ae4>rLiU5||HpoM7$Y665Za3$EHf}ktA!6XWLHUw zQIGn~>*>a4sn~RV?wX~A63tR~cv87ucnAWJ))TvtDv!K*bneAg`7+&`m>p$%gZ00vb>24DE&0KuK*D3mw!Pt>{^*x1q6YA?{+%8S z_{|x3lp%|j)us$HJC}+-jYKr_k{^Q#Td3a;30dgYtS_+vf@3>vakZW20YdmOMdHv6c4CSd=JM0X(j7Z05J@-3C zzl+$o1eihoLsMW&P=_{|<#8qhZVTR8qP2W#k~Dm{WVFEc>eV Slknupa-|*6Cn;&~W&8&u7TD|n