summaryrefslogtreecommitdiff
path: root/testsuite/tools/Makefile.am
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-05-24 21:03:56 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-05-24 21:03:56 +0200
commit58912f68c2489bcee787599837447e0d64dfd61a (patch)
treedda50aadde35fe152da1a8d50769987ace0f1496 /testsuite/tools/Makefile.am
parentcfd27ef2ad8b005fd47ab41ef29b71d9e3d48201 (diff)
New upstream version 1.0.27upstream/1.0.27
Diffstat (limited to 'testsuite/tools/Makefile.am')
-rw-r--r--testsuite/tools/Makefile.am9
1 files changed, 6 insertions, 3 deletions
diff --git a/testsuite/tools/Makefile.am b/testsuite/tools/Makefile.am
index 1664ecb..71188d2 100644
--- a/testsuite/tools/Makefile.am
+++ b/testsuite/tools/Makefile.am
@@ -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 ;\