X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2FMakefile.am;h=3600e99d87786920764a65c4d84b839a826a41cc;hb=827b3af01adcd2955f5a46044156a527a906d777;hp=d72b1ecd89fd30c94154c10e294d1a0cca1e4987;hpb=9c4445429c2c2d558a13023dd4c9bbcf24f8cc7b;p=lttng-tools.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index d72b1ecd8..3600e99d8 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 PYTHON_BINDING
-	./run.sh with_bindings_regression
-endif
+SUBDIRS =
+DIST_SUBDIRS = utils regression unit stress destructive
 
+if BUILD_TESTS
+SUBDIRS += . utils regression unit stress destructive
+if HAS_PGREP
 check-am:
-	./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 "========================================="
+	@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
+EXTRA_DIST = run.sh fast_regression long_regression root_regression README root_destructive_tests
 
 all-local:
 	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \