From 58912f68c2489bcee787599837447e0d64dfd61a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 24 May 2017 21:03:56 +0200 Subject: New upstream version 1.0.27 --- testsuite/tools/Makefile.am | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'testsuite/tools/Makefile.am') 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 ;\ -- cgit v1.2.3 From 1687222e1b9e74c89cafbb5910e72d8ec7bfd40f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 31 Jul 2019 16:59:49 +0200 Subject: New upstream version 1.0.28 --- testsuite/tools/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'testsuite/tools/Makefile.am') diff --git a/testsuite/tools/Makefile.am b/testsuite/tools/Makefile.am index 71188d2..532e904 100644 --- a/testsuite/tools/Makefile.am +++ b/testsuite/tools/Makefile.am @@ -1,5 +1,5 @@ ## Makefile.am -- an automake template for Makefile.in file -## Copyright (C) 2013 Stéphane Voltz and Sane Developers. +## Copyright (C) 2013 Stéphane Voltz and Sane Developers. ## ## This file is part of the "Sane" build infra-structure. See ## included LICENSE file for license information. @@ -26,13 +26,13 @@ help: check: check.local -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; \ 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]\+\(git\)\?$$" \ + -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"; \ -- cgit v1.2.3