From 321a982875793387c59e487c2f1fb53eca807dc9 Mon Sep 17 00:00:00 2001 From: Chris Bagwell Date: Fri, 16 Aug 2013 13:39:23 -0500 Subject: [PATCH] Fixes to tools testsuite for distcheck target Add missing data files to distribution. Use $srcdir so tests work when build and source directory are not the same. --- ChangeLog | 6 ++++++ testsuite/tools/Makefile.am | 14 +++++++++----- testsuite/tools/Makefile.in | 15 ++++++++++----- 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 78956570c..6a0aa7ee1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,12 @@ file. This allows "make distcheck" to work for this testcase since it uses a different build directory then source directory and also runs it from build directory. + * testsuite/sanei/sanei_usb_test.c: add a fake name string + when creating MAX_DEVICE fake devices so that strcmp() won't + crash. + * testsuite/tools/Makefile.am: Add missing data files to distribution. + Make use of $srcdir so test case can base when build directory + is not same as source directory. 2013-08-15 Chris Bagwell * sanei/sanei_thread.c: Add support for winpthreads used by diff --git a/testsuite/tools/Makefile.am b/testsuite/tools/Makefile.am index a07531503..178041bac 100644 --- a/testsuite/tools/Makefile.am +++ b/testsuite/tools/Makefile.am @@ -12,7 +12,11 @@ TESTFILE = $(srcdir)/data/testfile.desc OUTFILES = *.res DEVICE = test -EXTRA_DIST = data/testfile.desc +EXTRA_DIST = data/testfile.desc data/ascii.ref data/db.ref data/hal-new.ref \ + data/hal.ref data/html-backends-split.ref data/html-mfgs.ref \ + data/hwdb.ref data/plist.ref data/statistics.ref \ + data/udev+acl.ref data/udev+hwdb.ref data/udev.ref \ + data/usermap.ref data/xml.ref CLEANFILES = $(OUTFILES) all: help @@ -26,11 +30,11 @@ 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"; \ - $(SANEDESC) -m $$mode -s data >$$mode.res ;\ - if ! diff --ignore-matching-lines="..:..:.. 20[0-9][0-9]" data/$$mode.ref $$mode.res ; \ + 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]" $(srcdir)/data/$$mode.ref $$mode.res ; \ then \ - echo "**** File generated for $$mode modee is different from reference" ;\ + echo "**** File generated for $$mode mode is different from reference" ;\ exit 1 ;\ fi; \ done ;\ diff --git a/testsuite/tools/Makefile.in b/testsuite/tools/Makefile.in index b9d541657..6f735d01d 100644 --- a/testsuite/tools/Makefile.in +++ b/testsuite/tools/Makefile.in @@ -288,7 +288,12 @@ SANEDESC = ../../tools/sane-desc$(EXEEXT) TESTFILE = $(srcdir)/data/testfile.desc OUTFILES = *.res DEVICE = test -EXTRA_DIST = data/testfile.desc +EXTRA_DIST = data/testfile.desc data/ascii.ref data/db.ref data/hal-new.ref \ + data/hal.ref data/html-backends-split.ref data/html-mfgs.ref \ + data/hwdb.ref data/plist.ref data/statistics.ref \ + data/udev+acl.ref data/udev+hwdb.ref data/udev.ref \ + data/usermap.ref data/xml.ref + CLEANFILES = $(OUTFILES) all: all-am @@ -496,11 +501,11 @@ 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"; \ - $(SANEDESC) -m $$mode -s data >$$mode.res ;\ - if ! diff --ignore-matching-lines="..:..:.. 20[0-9][0-9]" data/$$mode.ref $$mode.res ; \ + 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]" $(srcdir)/data/$$mode.ref $$mode.res ; \ then \ - echo "**** File generated for $$mode modee is different from reference" ;\ + echo "**** File generated for $$mode mode is different from reference" ;\ exit 1 ;\ fi; \ done ;\