70 lines
2.0 KiB
Diff
70 lines
2.0 KiB
Diff
From 459e471fcc33d300f7bbcdaf3e0dc338d9dc15b9 Mon Sep 17 00:00:00 2001
|
|
From: Khem Raj <raj.khem@gmail.com>
|
|
Date: Sat, 30 Apr 2016 16:56:34 +0000
|
|
Subject: [PATCH] add knobs to disable/enable tests
|
|
|
|
Some tests do not compile on musl libc
|
|
in general its good to have such a knob
|
|
since not all builds may want to enable
|
|
tests
|
|
|
|
Upstream-Status: Pending
|
|
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
---
|
|
Makefile.am | 6 +++++-
|
|
configure.ac | 12 ++++++++++--
|
|
2 files changed, 15 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/Makefile.am b/Makefile.am
|
|
index 6a3ed9e..0c29b3e 100644
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -42,7 +42,11 @@ endif
|
|
|
|
nodist_include_HEADERS = include/libunwind-common.h
|
|
|
|
-SUBDIRS = src tests
|
|
+SUBDIRS = src
|
|
+
|
|
+if CONFIG_TESTS
|
|
+SUBDIRS += tests
|
|
+endif
|
|
|
|
if CONFIG_DOCS
|
|
SUBDIRS += doc
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 85d78f8..d362387 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -129,6 +129,10 @@ AC_ARG_ENABLE(documentation,
|
|
AS_HELP_STRING([--disable-documentation],[Disable generating the man pages]),,
|
|
[enable_documentation=yes])
|
|
|
|
+AC_ARG_ENABLE(tests,
|
|
+ AS_HELP_STRING([--disable-tests],[Disable building tests]),,
|
|
+ [enable_tests=yes])
|
|
+
|
|
AC_MSG_CHECKING([if we should build libunwind-setjmp])
|
|
AC_MSG_RESULT([$enable_setjmp])
|
|
|
|
@@ -395,9 +399,13 @@ AM_CONDITIONAL([CONFIG_DOCS], [test x$enable_documentation = xyes])
|
|
if test "x$enable_documentation" = "xyes"; then
|
|
AC_CONFIG_FILES(doc/Makefile doc/common.tex)
|
|
fi
|
|
+AM_CONDITIONAL([CONFIG_TESTS], [test x$enable_tests = xyes])
|
|
+if test "x$enable_tests" = "xyes"; then
|
|
+ AC_CONFIG_FILES(tests/Makefile tests/check-namespace.sh)
|
|
+fi
|
|
+
|
|
|
|
-AC_CONFIG_FILES(Makefile src/Makefile tests/Makefile tests/check-namespace.sh
|
|
- include/libunwind-common.h
|
|
+AC_CONFIG_FILES(Makefile src/Makefile include/libunwind-common.h
|
|
include/libunwind.h include/tdep/libunwind_i.h)
|
|
AC_CONFIG_FILES(src/unwind/libunwind.pc src/coredump/libunwind-coredump.pc
|
|
src/ptrace/libunwind-ptrace.pc src/setjmp/libunwind-setjmp.pc
|
|
--
|
|
1.8.3.1
|
|
|