mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

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
Chris Bagwell 2013-08-16 13:39:23 -05:00
rodzic 43da1e64c1
commit 321a982875
3 zmienionych plików z 25 dodań i 10 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
ChangeLog
Wyświetl plik

@ -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 <chris@cnpbagwell.com>
* sanei/sanei_thread.c: Add support for winpthreads used by

14
testsuite/tools/Makefile.am
Wyświetl plik

@ -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 ;\

15
testsuite/tools/Makefile.in
Wyświetl plik

@ -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 ;\