X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2FMakefile.am;h=94ac152603d74cbcd2d7b91c7755df4dfa8bbedf;hp=017163f51d24573a46ab7b12a19ed090fd825b2e;hb=c7031a2c707646804e0088d069578d5eb74fc01e;hpb=512eb1488340c4c3c0c29e6cde9d489e858fdd6c

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 017163f51..94ac15260 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,35 +1,11 @@
 SUBDIRS =
-DIST_SUBDIRS = utils regression unit stress destructive
+DIST_SUBDIRS = utils unit regression stress destructive perf
 
 if BUILD_TESTS
-SUBDIRS += utils regression unit stress destructive
-endif
-
-installcheck-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
-endif
-else
-	@echo "========================================="
-	@echo "WARNING: Tests were disabled at configure"
-	@echo "========================================="
-endif
-
+SUBDIRS += . utils unit regression stress destructive perf
+if HAVE_PGREP
 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 root_destructive_tests
-EXTRA_DIST = run.sh unit_tests fast_regression long_regression root_regression with_bindings_regression README root_destructive_tests
+
+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 \