|
@@ -1,18 +1,18 @@
|
|
-From 95527e43845a5063a6125d7779a30d44c3b437ac Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From fe965061b4306e3ca811ff86dc1ca29f7db9af18 Mon Sep 17 00:00:00 2001
|
|
From: Peter Seiderer <ps.report@gmx.net>
|
|
From: Peter Seiderer <ps.report@gmx.net>
|
|
Date: Sun, 11 Oct 2015 13:33:19 +0200
|
|
Date: Sun, 11 Oct 2015 13:33:19 +0200
|
|
Subject: [PATCH] configure: add '--disable-runtime-tests' option
|
|
Subject: [PATCH] configure: add '--disable-runtime-tests' option
|
|
|
|
|
|
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
|
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
|
---
|
|
---
|
|
- configure.ac | 11 +++++++++--
|
|
|
|
- 1 file changed, 9 insertions(+), 2 deletions(-)
|
|
|
|
|
|
+ configure.ac | 15 +++++++++++----
|
|
|
|
+ 1 file changed, 11 insertions(+), 4 deletions(-)
|
|
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
diff --git a/configure.ac b/configure.ac
|
|
-index 54a2510..286737b 100644
|
|
|
|
|
|
+index c1a9111..8fe7b8b 100644
|
|
--- a/configure.ac
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
+++ b/configure.ac
|
|
-@@ -74,7 +74,14 @@ else
|
|
|
|
|
|
+@@ -76,13 +76,20 @@ else
|
|
AC_MSG_WARN([check not found - skipping building unit tests])
|
|
AC_MSG_WARN([check not found - skipping building unit tests])
|
|
fi
|
|
fi
|
|
AM_CONDITIONAL(HAVE_VALGRIND, [test "x$VALGRIND" != "x"])
|
|
AM_CONDITIONAL(HAVE_VALGRIND, [test "x$VALGRIND" != "x"])
|
|
@@ -27,16 +27,25 @@ index 54a2510..286737b 100644
|
|
+AM_CONDITIONAL(ENABLE_RUNTIME_TESTS, [test "x${enable_runtime_tests}x$HAVE_CHECK" = "xyesxyes"])
|
|
+AM_CONDITIONAL(ENABLE_RUNTIME_TESTS, [test "x${enable_runtime_tests}x$HAVE_CHECK" = "xyesxyes"])
|
|
AM_CONDITIONAL(ENABLE_STATIC_LINK_TEST, [test "x$enable_static" = "xyes"])
|
|
AM_CONDITIONAL(ENABLE_STATIC_LINK_TEST, [test "x$enable_static" = "xyes"])
|
|
|
|
|
|
|
|
+ AC_ARG_ENABLE([test-run],
|
|
|
|
+ AS_HELP_STRING([--enable-test-run], [For internal use only]),
|
|
|
|
+ [run_tests="$enableval"], [run_tests="yes"])
|
|
|
|
+-AM_CONDITIONAL(RUN_TESTS, [test "x$run_tests" = "xyes"])
|
|
|
|
++AM_CONDITIONAL(RUN_TESTS, [test "x${enable_runtime_tests}x$run_tests" = "xyesxyes"])
|
|
|
|
+
|
|
with_cflags=""
|
|
with_cflags=""
|
|
-@@ -159,7 +166,7 @@ AC_MSG_RESULT([
|
|
|
|
|
|
+ if test "x$GCC" = "xyes"; then
|
|
|
|
+@@ -167,8 +174,8 @@ AC_MSG_RESULT([
|
|
Libdir ${libdir}
|
|
Libdir ${libdir}
|
|
|
|
|
|
Build documentation ${have_doxygen}
|
|
Build documentation ${have_doxygen}
|
|
- Enable unit-tests ${HAVE_CHECK}
|
|
- Enable unit-tests ${HAVE_CHECK}
|
|
|
|
+- Run unit-tests ${run_tests}
|
|
+ Enable unit-tests ${HAVE_CHECK} (runtime-tests: ${enable_runtime_tests})
|
|
+ Enable unit-tests ${HAVE_CHECK} (runtime-tests: ${enable_runtime_tests})
|
|
|
|
++ Run unit-tests ${run_tests} (runtime-tests: ${enable_runtime_tests})
|
|
Enable profiling ${enable_gcov}
|
|
Enable profiling ${enable_gcov}
|
|
Static library symbol check ${static_symbol_leaks_test}
|
|
Static library symbol check ${static_symbol_leaks_test}
|
|
])
|
|
])
|
|
--
|
|
--
|
|
-2.1.4
|
|
|
|
|
|
+2.11.0
|
|
|
|
|