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

Fix sane-desc testsuite logic 

This fixes test failures for release tarballs (pointed out by Mike
Frysinger), clamps down on wildcards and prints a failure message
when a test does not succeed.
merge-requests/1/head
Olaf Meeuwissen 2015-11-08 18:16:17 +09:00
rodzic 358cbd7f31
commit d7516a11eb
2 zmienionych plików z 12 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -30,11 +30,14 @@ check.local:
@echo "**** Testing $(SANEDESC) with $(TESTFILE)"
@for mode in ascii html-backends-split html-mfgs xml statistics usermap db udev udev+acl udev+hwdb hwdb plist hal hal-new; \
do \
echo "PASS: sane-desc -m $$mode -s $(srcdir)/data"; \
$(SANEDESC) -m $$mode -s $(srcdir)/data >$$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 ; \
if diff -I "[ 012][0-9]:[0-5][0-9]:[0-6][0-9] 20[0-9][0-9]" \
-I "sane-backends 1\.0\.[0-9]\+\(git\)\?$$" \
$(srcdir)/data/$$mode.ref $$mode.res ; \
then \
echo "**** File generated for $$mode mode is different from reference" ;\
echo "PASS: sane-desc -m $$mode -s $(srcdir)/data"; \
else \
echo "FAIL: sane-desc -m $$mode -s $(srcdir)/data"; \
exit 1 ;\
fi; \
done ;\

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

@ -505,11 +505,14 @@ check.local:
@echo "**** Testing $(SANEDESC) with $(TESTFILE)"
@for mode in ascii html-backends-split html-mfgs xml statistics usermap db udev udev+acl udev+hwdb hwdb plist hal hal-new; \
do \
echo "PASS: sane-desc -m $$mode -s $(srcdir)/data"; \
$(SANEDESC) -m $$mode -s $(srcdir)/data >$$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 ; \
if diff -I "[ 012][0-9]:[0-5][0-9]:[0-6][0-9] 20[0-9][0-9]" \
-I "sane-backends 1\.0\.[0-9]\+\(git\)\?$$" \
$(srcdir)/data/$$mode.ref $$mode.res ; \
then \
echo "**** File generated for $$mode mode is different from reference" ;\
echo "PASS: sane-desc -m $$mode -s $(srcdir)/data"; \
else \
echo "FAIL: sane-desc -m $$mode -s $(srcdir)/data"; \
exit 1 ;\
fi; \
done ;\