summaryrefslogtreecommitdiff
path: root/testsuite/tools/Makefile.am
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2020-08-24 18:45:55 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2020-08-24 18:45:55 +0200
commita77bc1fcbdf83cfdac9570c0a0ac886b5534c90f (patch)
treed839746371ecb8ed64ac81d2e37c11fcd25a00ac /testsuite/tools/Makefile.am
parent787fb1d54ec9ee5fb941ae897fb201feb9cb2fd1 (diff)
parent2b3e02411ecc09e7d41741b5587655c9b2f955b7 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'testsuite/tools/Makefile.am')
-rw-r--r--testsuite/tools/Makefile.am20
1 files changed, 13 insertions, 7 deletions
diff --git a/testsuite/tools/Makefile.am b/testsuite/tools/Makefile.am
index 532e904..5fd97ca 100644
--- a/testsuite/tools/Makefile.am
+++ b/testsuite/tools/Makefile.am
@@ -28,19 +28,25 @@ check: check.local
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; \
+ @pass=true; \
+ for mode in ascii html-backends-split html-mfgs xml statistics usermap db udev udev+acl udev+hwdb hwdb plist hal hal-new; \
do \
$(SANEDESC) -m $$mode -s $(srcdir)/data >$$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]\+\([-0-9a-fgdirty]\+\)\?$$" \
+ if diff -I "sane-backends 1\.0\.[0-9]\+\([-0-9a-fgdirty]\+\)\?$$" \
$(srcdir)/data/$$mode.ref $$mode.res ; \
then \
echo "PASS: sane-desc -m $$mode -s $(srcdir)/data"; \
else \
echo "FAIL: sane-desc -m $$mode -s $(srcdir)/data"; \
- exit 1 ;\
+ pass=false ; \
fi; \
done ;\
- echo "================" ;\
- echo "All tests passed" ;\
- echo "================"
+ if `$$pass`; then \
+ echo "================" ; \
+ echo "All tests passed" ; \
+ echo "================" ; \
+ else \
+ echo "========================" ; \
+ echo "One or more tests failed" ; \
+ echo "========================" ; \
+ fi