X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2FMakefile.am;h=94ac152603d74cbcd2d7b91c7755df4dfa8bbedf;hp=2f1f1c38b36d1727b7dcbd291a41e6c5a67df719;hb=3f7f208a0150d93363cbf7755e890a9839114ab5;hpb=94dab75b56f0bcfa8389c6befe3d4be3fbb3c75e

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2f1f1c38b..94ac15260 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,21 +1,21 @@
-SUBDIRS = utils regression unit stress
-
-installcheck-am:
-	./run.sh unit_tests
-	./run.sh fast_regression
-if USE_PYTHON
-	./run.sh with_bindings_regression
-endif
+SUBDIRS =
+DIST_SUBDIRS = utils unit regression stress destructive perf
 
+if BUILD_TESTS
+SUBDIRS += . utils unit regression stress destructive perf
+if HAVE_PGREP
 check-am:
-	./run.sh unit_tests
-	./run.sh fast_regression
-if USE_PYTHON
-	./run.sh with_bindings_regression
+	$(top_srcdir)/tests/utils/warn_processes.sh $(PGREP)
 endif
+else
+	@echo "========================================="
+	@echo "WARNING: Tests were disabled at configure"
+	@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 \