diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-07-15 11:29:05 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-07-15 11:29:05 +0200 |
| commit | 324a8a71bb7d9e4f8bc49b6bc47efaf9fb58282e (patch) | |
| tree | bd2d48a139bfbe869f4f49359b63097931a45e7b /testsuite/tools/Makefile.am | |
| parent | 2ca8a81bd0d99fe4d75c229d0e988d8ef710285f (diff) | |
| parent | 1edb02101a9306fc711cd422ed507d18165b1691 (diff) | |
Merge branch 'release/experimental/1.0.27-1_experimental1'experimental/1.0.27-1_experimental1
Diffstat (limited to 'testsuite/tools/Makefile.am')
| -rw-r--r-- | testsuite/tools/Makefile.am | 9 |
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 ;\ |