From: Jérémie Galarneau Date: Wed, 27 Mar 2013 03:23:03 +0000 (-0400) Subject: Fix: Run tests requiring the python bindings only when they are enabled X-Git-Tag: v2.2.0-rc1~16 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=bbb85c88c898621b07e71a9ed2073d95a8196418;p=lttng-tools.git Fix: Run tests requiring the python bindings only when they are enabled Signed-off-by: Jérémie Galarneau Signed-off-by: David Goulet --- diff --git a/tests/Makefile.am b/tests/Makefile.am index a95afa73e..5feaca2d3 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,5 +1,12 @@ SUBDIRS = utils regression unit +if USE_PYTHON check-am: ./run.sh unit_tests ./run.sh fast_regression + ./run.sh with_bindings_regression +else +check-am: + ./run.sh unit_tests + ./run.sh fast_regression +endif diff --git a/tests/fast_regression b/tests/fast_regression index 175bb036d..fb4ac6037 100644 --- a/tests/fast_regression +++ b/tests/fast_regression @@ -12,8 +12,3 @@ regression/ust/nprocesses/test_nprocesses regression/ust/overlap/test_overlap regression/ust/test_event_basic regression/ust/test_event_wildcard -regression/ust/linking/test_linking -regression/ust/daemon/test_daemon -regression/ust/exit-fast/test_exit-fast -regression/ust/fork/test_fork -regression/ust/libc-wrapper/test_libc-wrapper diff --git a/tests/long_regression b/tests/long_regression index 8b1cbfc24..c198178ec 100644 --- a/tests/long_regression +++ b/tests/long_regression @@ -14,8 +14,3 @@ regression/ust/nprocesses/test_nprocesses regression/ust/overlap/test_overlap regression/ust/test_event_basic regression/ust/test_event_wildcard -regression/ust/linking/test_linking -regression/ust/daemon/test_daemon -regression/ust/exit-fast/test_exit-fast -regression/ust/fork/test_fork -regression/ust/libc-wrapper/test_libc-wrapper diff --git a/tests/with_bindings_regression b/tests/with_bindings_regression new file mode 100644 index 000000000..5cb190382 --- /dev/null +++ b/tests/with_bindings_regression @@ -0,0 +1,5 @@ +regression/ust/linking/test_linking +regression/ust/daemon/test_daemon +regression/ust/exit-fast/test_exit-fast +regression/ust/fork/test_fork +regression/ust/libc-wrapper/test_libc-wrapper