[lttng-dev] [PATCH lttng-tools] Fix: Run tests requiring the python bindings only when they are enabled

David Goulet dgoulet at efficios.com
Wed Mar 27 10:38:53 EDT 2013


Merged!

Jérémie Galarneau:
> Signed-off-by: Jérémie Galarneau <jeremie.galarneau at efficios.com>
> ---
>  tests/Makefile.am              | 7 +++++++
>  tests/fast_regression          | 5 -----
>  tests/long_regression          | 5 -----
>  tests/with_bindings_regression | 5 +++++
>  4 files changed, 12 insertions(+), 10 deletions(-)
>  create mode 100644 tests/with_bindings_regression
> 
> diff --git a/tests/Makefile.am b/tests/Makefile.am
> index a95afa7..5feaca2 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 175bb03..fb4ac60 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 8b1cbfc..c198178 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 0000000..5cb1903
> --- /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



More information about the lttng-dev mailing list