kopia lustrzana https://gitlab.com/sane-project/backends
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.merge-requests/1/head
rodzic
43da1e64c1
commit
321a982875
|
@ -6,6 +6,12 @@
|
||||||
file. This allows "make distcheck" to work for this testcase
|
file. This allows "make distcheck" to work for this testcase
|
||||||
since it uses a different build directory then source directory
|
since it uses a different build directory then source directory
|
||||||
and also runs it from build 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 <chris@cnpbagwell.com>
|
2013-08-15 Chris Bagwell <chris@cnpbagwell.com>
|
||||||
* sanei/sanei_thread.c: Add support for winpthreads used by
|
* sanei/sanei_thread.c: Add support for winpthreads used by
|
||||||
|
|
|
@ -12,7 +12,11 @@ TESTFILE = $(srcdir)/data/testfile.desc
|
||||||
OUTFILES = *.res
|
OUTFILES = *.res
|
||||||
DEVICE = test
|
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)
|
CLEANFILES = $(OUTFILES)
|
||||||
|
|
||||||
all: help
|
all: help
|
||||||
|
@ -26,11 +30,11 @@ check.local:
|
||||||
@echo "**** Testing $(SANEDESC) with $(TESTFILE)"
|
@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; \
|
@for mode in ascii html-backends-split html-mfgs xml statistics usermap db udev udev+acl udev+hwdb hwdb plist hal hal-new; \
|
||||||
do \
|
do \
|
||||||
echo "PASS: sane-desc -m $$mode"; \
|
echo "PASS: sane-desc -m $$mode -s $(srcdir)/data"; \
|
||||||
$(SANEDESC) -m $$mode -s data >$$mode.res ;\
|
$(SANEDESC) -m $$mode -s $(srcdir)/data >$$mode.res ;\
|
||||||
if ! diff --ignore-matching-lines="..:..:.. 20[0-9][0-9]" data/$$mode.ref $$mode.res ; \
|
if ! diff --ignore-matching-lines="..:..:.. 20[0-9][0-9]" $(srcdir)/data/$$mode.ref $$mode.res ; \
|
||||||
then \
|
then \
|
||||||
echo "**** File generated for $$mode modee is different from reference" ;\
|
echo "**** File generated for $$mode mode is different from reference" ;\
|
||||||
exit 1 ;\
|
exit 1 ;\
|
||||||
fi; \
|
fi; \
|
||||||
done ;\
|
done ;\
|
||||||
|
|
|
@ -288,7 +288,12 @@ SANEDESC = ../../tools/sane-desc$(EXEEXT)
|
||||||
TESTFILE = $(srcdir)/data/testfile.desc
|
TESTFILE = $(srcdir)/data/testfile.desc
|
||||||
OUTFILES = *.res
|
OUTFILES = *.res
|
||||||
DEVICE = test
|
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)
|
CLEANFILES = $(OUTFILES)
|
||||||
all: all-am
|
all: all-am
|
||||||
|
|
||||||
|
@ -496,11 +501,11 @@ check.local:
|
||||||
@echo "**** Testing $(SANEDESC) with $(TESTFILE)"
|
@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; \
|
@for mode in ascii html-backends-split html-mfgs xml statistics usermap db udev udev+acl udev+hwdb hwdb plist hal hal-new; \
|
||||||
do \
|
do \
|
||||||
echo "PASS: sane-desc -m $$mode"; \
|
echo "PASS: sane-desc -m $$mode -s $(srcdir)/data"; \
|
||||||
$(SANEDESC) -m $$mode -s data >$$mode.res ;\
|
$(SANEDESC) -m $$mode -s $(srcdir)/data >$$mode.res ;\
|
||||||
if ! diff --ignore-matching-lines="..:..:.. 20[0-9][0-9]" data/$$mode.ref $$mode.res ; \
|
if ! diff --ignore-matching-lines="..:..:.. 20[0-9][0-9]" $(srcdir)/data/$$mode.ref $$mode.res ; \
|
||||||
then \
|
then \
|
||||||
echo "**** File generated for $$mode modee is different from reference" ;\
|
echo "**** File generated for $$mode mode is different from reference" ;\
|
||||||
exit 1 ;\
|
exit 1 ;\
|
||||||
fi; \
|
fi; \
|
||||||
done ;\
|
done ;\
|
||||||
|
|
Ładowanie…
Reference in New Issue