From ad38bc6ecb80ddeb562841b33258dd53659b1da6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 24 Aug 2020 18:44:51 +0200 Subject: New upstream version 1.0.31 --- testsuite/tools/Makefile.am | 20 +++++++++++++------- testsuite/tools/data/db.ref | 4 ++-- testsuite/tools/data/html-backends-split.ref | 3 +-- testsuite/tools/data/html-mfgs.ref | 3 +-- testsuite/tools/data/hwdb.ref | 4 ++-- testsuite/tools/data/udev+acl.ref | 4 ++-- testsuite/tools/data/udev+hwdb.ref | 4 ++-- testsuite/tools/data/udev.ref | 4 ++-- testsuite/tools/data/usermap.ref | 4 ++-- 9 files changed, 27 insertions(+), 23 deletions(-) (limited to 'testsuite/tools') 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 diff --git a/testsuite/tools/data/db.ref b/testsuite/tools/data/db.ref index 3828667..3df3e95 100644 --- a/testsuite/tools/data/db.ref +++ b/testsuite/tools/data/db.ref @@ -1,5 +1,5 @@ -# This file was automatically created based on description files (*.desc) -# by sane-desc 3.5 from sane-backends 1.0.24git on Wed Jul 31 07:52:48 2013 +# This file was generated from description files (*.desc) +# by sane-desc 3.6 from sane-backends 1.0.29-241-g1f9590ab # # The entries below are used to detect a USB device when it's plugged in # and then run a script to change the ownership and diff --git a/testsuite/tools/data/html-backends-split.ref b/testsuite/tools/data/html-backends-split.ref index bd8d154..1b2e8dd 100644 --- a/testsuite/tools/data/html-backends-split.ref +++ b/testsuite/tools/data/html-backends-split.ref @@ -16496,7 +16496,6 @@ Grandtek Scopecam >Contact -This page was last updated on Wed Jul 31 07:52:48 2013 - by sane-desc 3.5 from sane-backends 1.0.24git +This page was created by sane-desc 3.6 from sane-backends 1.0.29-241-g1f9590ab diff --git a/testsuite/tools/data/html-mfgs.ref b/testsuite/tools/data/html-mfgs.ref index 1b34bb4..3c7f2ae 100644 --- a/testsuite/tools/data/html-mfgs.ref +++ b/testsuite/tools/data/html-mfgs.ref @@ -23910,7 +23910,6 @@ qcam
(unmaintained) >Contact -This page was last updated on Wed Jul 31 07:52:48 2013 - by sane-desc 3.5 from sane-backends 1.0.24git +This page was created by sane-desc 3.6 from sane-backends 1.0.29-241-g1f9590ab diff --git a/testsuite/tools/data/hwdb.ref b/testsuite/tools/data/hwdb.ref index 9adc73f..1dd6b2a 100644 --- a/testsuite/tools/data/hwdb.ref +++ b/testsuite/tools/data/hwdb.ref @@ -1,5 +1,5 @@ -# This file was automatically created based on description files (*.desc) -# by sane-desc 3.5 from sane-backends 1.0.25git on Tue Dec 3 15:24:46 2013 +# This file was generated from description files (*.desc) +# by sane-desc 3.6 from sane-backends 1.0.29-241-g1f9590ab # # hwdb file for supported USB devices # diff --git a/testsuite/tools/data/udev+acl.ref b/testsuite/tools/data/udev+acl.ref index bcedd50..81a81d3 100644 --- a/testsuite/tools/data/udev+acl.ref +++ b/testsuite/tools/data/udev+acl.ref @@ -1,5 +1,5 @@ -# This file was automatically created based on description files (*.desc) -# by sane-desc 3.5 from sane-backends 1.0.24git on Wed Jul 31 07:52:49 2013 +# This file was generated from description files (*.desc) +# by sane-desc 3.6 from sane-backends 1.0.29-241-g1f9590ab # # udev rules file for supported USB and SCSI devices # diff --git a/testsuite/tools/data/udev+hwdb.ref b/testsuite/tools/data/udev+hwdb.ref index ead2939..2cb6ff7 100644 --- a/testsuite/tools/data/udev+hwdb.ref +++ b/testsuite/tools/data/udev+hwdb.ref @@ -1,5 +1,5 @@ -# This file was automatically created based on description files (*.desc) -# by sane-desc 3.5 from sane-backends 1.0.24git on Thu Aug 1 18:50:15 2013 +# This file was generated from description files (*.desc) +# by sane-desc 3.6 from sane-backends 1.0.29-241-g1f9590ab # # udev rules file for supported USB and SCSI devices # diff --git a/testsuite/tools/data/udev.ref b/testsuite/tools/data/udev.ref index bd448af..478e8d5 100644 --- a/testsuite/tools/data/udev.ref +++ b/testsuite/tools/data/udev.ref @@ -1,5 +1,5 @@ -# This file was automatically created based on description files (*.desc) -# by sane-desc 3.5 from sane-backends 1.0.24git on Wed Jul 31 07:52:48 2013 +# This file was generated from description files (*.desc) +# by sane-desc 3.6 from sane-backends 1.0.29-241-g1f9590ab # # udev rules file for supported USB and SCSI devices # diff --git a/testsuite/tools/data/usermap.ref b/testsuite/tools/data/usermap.ref index b1d5a9f..0b7281b 100644 --- a/testsuite/tools/data/usermap.ref +++ b/testsuite/tools/data/usermap.ref @@ -1,5 +1,5 @@ -# This file was automatically created based on description files (*.desc) -# by sane-desc 3.5 from sane-backends 1.0.24git on Wed Jul 31 07:52:48 2013 +# This file was generated from description files (*.desc) +# by sane-desc 3.6 from sane-backends 1.0.29-241-g1f9590ab # # The entries below are used to detect a USB device and change owner # and permissions on the "device node" used by libusb. -- cgit v1.2.3