Diff between 301904d649db6df8ae4735d7a90109993d9a4523 and df43b3dad829e8b7f79fd15c20d997f50e745ae7

Changed Files

File Additions Deletions Status
Makefile.tools +1 -1 modified
README +11 -0 modified
bootstrap-configure +1 -0 modified
configure.ac +5 -0 modified

Full Patch

diff --git a/Makefile.tools b/Makefile.tools
index a6995a0..55d392e 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -44,7 +44,7 @@ monitor_btmon_LDADD = lib/libbluetooth-internal.la \
 				src/libshared-mainloop.la @UDEV_LIBS@
 endif
 
-if EXPERIMENTAL
+if TESTING
 noinst_PROGRAMS += emulator/btvirt emulator/b1ee emulator/hfp \
 					peripheral/btsensor tools/3dsp \
 					tools/mgmt-tester tools/gap-tester \
diff --git a/README b/README
index ea1af9e..5da6029 100644
--- a/README
+++ b/README
@@ -155,6 +155,17 @@ For a working system, certain configuration options need to be enabled:
 		This option is provided for distributions that do not have any
 		input capabilities.
 
+	--enable-testing
+
+		Enable testing tools
+
+		By default tools used only for testing emulation are disabled.
+		This option can be used to enable them.
+
+		It is not recommended to enable this option for production
+		systems. These tools may contain tests that depend on specific
+		environment or kernel features in development.
+
 	--enable-experimental
 
 		Enable experimental tools
diff --git a/bootstrap-configure b/bootstrap-configure
index d0a0b91..7abe360 100755
--- a/bootstrap-configure
+++ b/bootstrap-configure
@@ -13,6 +13,7 @@ fi
 		--localstatedir=/var \
 		--enable-manpages \
 		--enable-backtrace \
+		--enable-testing \
 		--enable-experimental \
 		--enable-nfc \
 		--enable-sap \
diff --git a/configure.ac b/configure.ac
index fb8deab..91b4955 100644
--- a/configure.ac
+++ b/configure.ac
@@ -285,6 +285,11 @@ AC_ARG_ENABLE(manpages, AC_HELP_STRING([--enable-manpages],
 					[enable_manpages=${enableval}])
 AM_CONDITIONAL(MANPAGES, test "${enable_manpages}" = "yes")
 
+AC_ARG_ENABLE(testing, AC_HELP_STRING([--enable-testing],
+			[enable testing tools]),
+					[enable_testing=${enableval}])
+AM_CONDITIONAL(TESTING, test "${enable_testing}" = "yes")
+
 AC_ARG_ENABLE(experimental, AC_HELP_STRING([--enable-experimental],
 			[enable experimental tools]),
 					[enable_experimental=${enableval}])