From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Thu, 21 Feb 2013 22:43:16 +0000 (-0500)
Subject: Clean-up of configure.ac and tests/Makefile.am
X-Git-Tag: v2.2.0-rc1~16
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=511b650c1303dbd883f5a546590473c561ad25bf;p=lttng-ust.git

Clean-up of configure.ac and tests/Makefile.am

Removal of disabled tests. Fixes ./configure failing
in distribution package because by missing Makefiles
in tests/ust-basic-tracing and tests/ust-multi-test.

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/configure.ac b/configure.ac
index fbc534b0..fec71492 100644
--- a/configure.ac
+++ b/configure.ac
@@ -248,23 +248,6 @@ AS_IF([test "x$with_sdt" = "xyes"],[
 	])
 ])
 
-#currently disabled.
-	#tests/hello2/Makefile
-	#tests/basic/Makefile
-	#tests/simple_include/Makefile
-	#tests/snprintf/Makefile
-	#tests/test-nevents/Makefile
-	#tests/test-libustinstr-malloc/Makefile
-	#tests/dlopen/Makefile
-	#tests/same_line_marker/Makefile
-	#tests/trace_event/Makefile
-	#tests/tracepoint/Makefile
-	#tests/tracepoint/benchmark/Makefile
-	#tests/register_test/Makefile
-	#tests/libustctl_function_#tests/Makefile
-	#tests/exit-fast/Makefile
-	#tests/basic_long/Makefile
-
 AC_CONFIG_FILES([
 	Makefile
 	doc/Makefile
@@ -287,8 +270,6 @@ AC_CONFIG_FILES([
 	tests/hello.cxx/Makefile
 	tests/same_line_tracepoint/Makefile
 	tests/snprintf/Makefile
-	tests/ust-basic-tracing/Makefile
-	tests/ust-multi-test/Makefile
 	lttng-ust.pc
 ])
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4d066081..21ba285b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,4 @@
 SUBDIRS = . hello hello-static-lib same_line_tracepoint snprintf
-#ust-basic-tracing ust-multi-test
-#SUBDIRS = . hello2 basic basic_long simple_include snprintf test-nevents test-libustinstr-malloc dlopen same_line_marker trace_event register_test tracepoint libustctl_function_tests exit-fast
 
 if CXX_WORKS
 SUBDIRS += hello.cxx