diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-09-03 14:00:35 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-09-03 14:00:35 +0000 |
commit | 2407969d2ce852aaf2a25441a91fc8f8f475d880 (patch) | |
tree | f13d79a036b8fb63c9ec2f7c9ed8e7f5077ac68e | |
parent | f3fce53f399ad1032c9eeb9600c08fc0bf9f9fc2 (diff) | |
download | libextractor-2407969d2ce852aaf2a25441a91fc8f8f475d880.tar.gz libextractor-2407969d2ce852aaf2a25441a91fc8f8f475d880.zip |
add option to disable running tests
-rw-r--r-- | configure.ac | 12 | ||||
-rw-r--r-- | src/main/Makefile.am | 2 | ||||
-rw-r--r-- | src/plugins/Makefile.am | 3 |
3 files changed, 16 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index ab6fe98..2391cf9 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -380,6 +380,18 @@ AC_CHECK_LIB(tidy, tidyInitSource, | |||
380 | LIBS=$LIBSOLD | 380 | LIBS=$LIBSOLD |
381 | 381 | ||
382 | 382 | ||
383 | |||
384 | # should 'make check' run tests? | ||
385 | AC_MSG_CHECKING(whether to run tests) | ||
386 | AC_ARG_ENABLE([testruns], | ||
387 | [AS_HELP_STRING([--disable-testruns], [disable running tests on make check (default is YES)])], | ||
388 | [enable_tests_run=${enableval}], | ||
389 | [enable_tests_run=yes]) | ||
390 | AC_MSG_RESULT($enable_test_run) | ||
391 | AM_CONDITIONAL([ENABLE_TEST_RUN], [test "x$enable_tests_run" = "xyes"]) | ||
392 | |||
393 | |||
394 | |||
383 | # Checks for header files. | 395 | # Checks for header files. |
384 | AC_HEADER_STDC | 396 | AC_HEADER_STDC |
385 | AC_HEADER_DIRENT | 397 | AC_HEADER_DIRENT |
diff --git a/src/main/Makefile.am b/src/main/Makefile.am index 0605eef..a2de4b4 100644 --- a/src/main/Makefile.am +++ b/src/main/Makefile.am | |||
@@ -101,7 +101,9 @@ check_PROGRAMS = \ | |||
101 | test_gzip \ | 101 | test_gzip \ |
102 | test_bzip2 | 102 | test_bzip2 |
103 | 103 | ||
104 | if ENABLE_TEST_RUN | ||
104 | TESTS = $(check_PROGRAMS) | 105 | TESTS = $(check_PROGRAMS) |
106 | endif | ||
105 | 107 | ||
106 | test_trivial_SOURCES = \ | 108 | test_trivial_SOURCES = \ |
107 | test_trivial.c | 109 | test_trivial.c |
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am index 8dee500..9dc328b 100644 --- a/src/plugins/Makefile.am +++ b/src/plugins/Makefile.am | |||
@@ -221,10 +221,11 @@ check_PROGRAMS = \ | |||
221 | $(TEST_TIFF) \ | 221 | $(TEST_TIFF) \ |
222 | $(TEST_ZLIB) | 222 | $(TEST_ZLIB) |
223 | 223 | ||
224 | if ENABLE_TEST_RUN | ||
224 | TESTS = \ | 225 | TESTS = \ |
225 | $(fuzz_tests) \ | 226 | $(fuzz_tests) \ |
226 | $(check_PROGRAMS) | 227 | $(check_PROGRAMS) |
227 | 228 | endif | |
228 | 229 | ||
229 | noinst_LTLIBRARIES = \ | 230 | noinst_LTLIBRARIES = \ |
230 | libtest.la | 231 | libtest.la |