mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

handle version number change in testsuite

merge-requests/1/head
Stphane Voltz 2013-11-21 05:38:39 +01:00
rodzic 758731489d
commit febae63aa3
3 zmienionych plików z 5 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
ChangeLog
Wyświetl plik

@ -1,3 +1,6 @@
2013-11-21 Stéphane Voltz <stef.dev@free.fr>
* testsuite/tools/Makefile.*: handle sane git version change in tests.
2013-10-19 Stéphane Voltz <stef.dev@free.fr> 2013-10-19 Stéphane Voltz <stef.dev@free.fr>
* doc/descriptions/genesys.desc doc/Descriptions/unsupported.desc: * doc/descriptions/genesys.desc doc/Descriptions/unsupported.desc:
update LiDE 80 and HP2400 information update LiDE 80 and HP2400 information

2
testsuite/tools/Makefile.am
Wyświetl plik

@ -32,7 +32,7 @@ check.local:
do \ do \
echo "PASS: sane-desc -m $$mode -s $(srcdir)/data"; \ echo "PASS: sane-desc -m $$mode -s $(srcdir)/data"; \
$(SANEDESC) -m $$mode -s $(srcdir)/data >$$mode.res ;\ $(SANEDESC) -m $$mode -s $(srcdir)/data >$$mode.res ;\
if ! diff --ignore-matching-lines="..:..:.. 20[0-9][0-9]" $(srcdir)/data/$$mode.ref $$mode.res ; \ if ! diff --ignore-matching-lines="..:..:.. 20[0-9][0-9]" --ignore-matching-lines="sane-backends 1.0...git" $(srcdir)/data/$$mode.ref $$mode.res ; \
then \ then \
echo "**** File generated for $$mode mode is different from reference" ;\ echo "**** File generated for $$mode mode is different from reference" ;\
exit 1 ;\ exit 1 ;\

2
testsuite/tools/Makefile.in
Wyświetl plik

@ -503,7 +503,7 @@ check.local:
do \ do \
echo "PASS: sane-desc -m $$mode -s $(srcdir)/data"; \ echo "PASS: sane-desc -m $$mode -s $(srcdir)/data"; \
$(SANEDESC) -m $$mode -s $(srcdir)/data >$$mode.res ;\ $(SANEDESC) -m $$mode -s $(srcdir)/data >$$mode.res ;\
if ! diff --ignore-matching-lines="..:..:.. 20[0-9][0-9]" $(srcdir)/data/$$mode.ref $$mode.res ; \ if ! diff --ignore-matching-lines="..:..:.. 20[0-9][0-9]" --ignore-matching-lines="sane-backends 1.0...git" $(srcdir)/data/$$mode.ref $$mode.res ; \
then \ then \
echo "**** File generated for $$mode mode is different from reference" ;\ echo "**** File generated for $$mode mode is different from reference" ;\
exit 1 ;\ exit 1 ;\