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 fbc534b0e5651cc10bed658df2a92328ae7b549a..fec71492192b5f62fcc19e682ef7d13622661d87 100644 (file)
--- 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 4d066081d22c3c1a1e6f70ae377ee1f36c1f2871..21ba285b1e5f81874d6e3c213b5223d7aa8aa4fa 100644 (file)
--- 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