X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2FMakefile.am;h=685d93c6ad6974e41aa91958e25b6d1651e33d62;hb=b55e7034ae4b3bf9fb7c88c9fd102896cf322efe;hp=31a958ec354d246417a7d41094ac2bec028294ca;hpb=b67cd6f052bb21a3c3c72840a9e55598951ba632;p=lttng-tools.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 31a958ec3..685d93c6a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,35 +1,11 @@
 SUBDIRS =
-DIST_SUBDIRS = utils regression unit stress
+DIST_SUBDIRS = utils unit regression stress destructive perf
 
 if BUILD_TESTS
-SUBDIRS += utils regression unit stress
-endif
-
-installcheck-am:
-if BUILD_TESTS
+SUBDIRS += . utils unit regression stress destructive perf
 if HAS_PGREP
-	./utils/warn_lttng_processes.sh $(PGREP)
-endif
-	./run.sh unit_tests
-	./run.sh fast_regression
-if PYTHON_BINDING
-	./run.sh with_bindings_regression
-endif
-else
-	@echo "========================================="
-	@echo "WARNING: Tests were disabled at configure"
-	@echo "========================================="
-endif
-
 check-am:
-if BUILD_TESTS
-if HAS_PGREP
-	./utils/warn_lttng_processes.sh $(PGREP)
-endif
-	./run.sh unit_tests
-	./run.sh fast_regression
-if PYTHON_BINDING
-	./run.sh with_bindings_regression
+	$(top_srcdir)/tests/utils/warn_processes.sh $(PGREP)
 endif
 else
 	@echo "========================================="
@@ -37,8 +13,9 @@ else
 	@echo "========================================="
 endif
 
-dist_noinst_SCRIPTS = run.sh unit_tests fast_regression long_regression root_regression with_bindings_regression
-EXTRA_DIST = run.sh unit_tests fast_regression long_regression root_regression with_bindings_regression README
+
+dist_noinst_SCRIPTS = run.sh fast_regression long_regression root_regression root_destructive_tests perf_regression
+EXTRA_DIST = run.sh fast_regression long_regression root_regression README root_destructive_tests perf_regression
 
 all-local:
 	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \