diff options
| author | libdlo <libdlo@displaylink.com> | 2009-05-13 16:29:32 -0700 |
|---|---|---|
| committer | libdlo <libdlo@displaylink.com> | 2009-05-13 16:29:32 -0700 |
| commit | 049a0c58ac7a20968786114d7f1c507bcec220fe (patch) | |
| tree | 71feb4b087c8e7862dddfcfdd5829a23d30d4c91 | |
| parent | 2cedca2a3e88253f39ccdbad7c96e2c82f4d58df (diff) | |
Tests not quite running correctly with make check yet, because images not found
| -rw-r--r-- | Makefile.am | 12 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | test/test1.c | 4 |
3 files changed, 14 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index f654ac6..5ff8c1b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,13 +3,23 @@ SUBDIRS=src \ dist_doc_DATA = README ACLOCAL_AMFLAGS = -I m4 AUTOMAKE_OPTIONS = foreign -EXTRA_DIST = autogen.sh +EXTRA_DIST = \ + autogen.sh \ + test/images/test08.bmp \ + test/images/test16.bmp \ + test/images/test24.bmp \ + test/images/test32.bmp + +TESTS_ENVIRONMENT = sudo +TESTS = test/test1 MAINTAINERCLEANFILES = depcomp INSTALL install-sh missing aclocal.m4 config.guess config.sub configure clean-local: test -d ./docs && rm -Rf ./docs || true +# overloading this to clean known files that shouldn't be in git. +# Much discussion of this on web. Not to standard, but common need. maintainer-clean-local: test -d ./m4 && rm -Rf ./m4 || true test -d ./config && rm -Rf ./config || true diff --git a/configure.ac b/configure.ac index 01ac67b..292779a 100644 --- a/configure.ac +++ b/configure.ac @@ -39,7 +39,6 @@ AC_CHECK_FUNCS([gettimeofday strchr]) AC_CONFIG_FILES([Makefile src/Makefile test/Makefile - test/test1/Makefile ]) AC_OUTPUT AC_MSG_RESULT([ diff --git a/test/test1.c b/test/test1.c index 071764d..fee70d2 100644 --- a/test/test1.c +++ b/test/test1.c @@ -26,7 +26,7 @@ #include "sys/time.h" #include "libdlo.h" -#include "../../src/dlo_defs.h" +#include "../src/dlo_defs.h" /** Default horizontal resolution we will use for tests (pixels). @@ -895,6 +895,8 @@ int main(int argc, char *argv[]) IGNORE(argc); IGNORE(argv); + printf("test: argv[0]: %s\n",argv[0]); + /* Initialise the random number generator with the microsecond time as a seed */ srand((unsigned int)now()); |