[lttng-dev] [PATCH lttng-tools v2] Test: prevent the spawning of a daemonized sessiond

[Jérémie Galarneau]

Merged in master, stable-2.7 and stable-2.6. Thanks!

Jérémie

On Tue, Mar 8, 2016 at 5:37 PM, Jonathan Rajotte
<jonathan.rajotte-julien at efficios.com> wrote:
> Sets the default lttng-sessiond path to /bin/true to prevent the spawning
> of a daemonized sessiond. This is necessary since 'lttng create' will spawn
> its own sessiond if none is running. It also make sure that 'lttng create'
> fails when no sessiond is running.
>
> Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien at efficios.com>
> ---
>  tests/utils/utils.sh | 6 ++++++
>  1 file changed, 6 insertions(+)
>
> diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
> index da23f7a..0d5c33e 100644
> --- a/tests/utils/utils.sh
> +++ b/tests/utils/utils.sh
> @@ -33,6 +33,12 @@ KERNEL_PATCHLEVEL_VERSION=27
>  # systems. Specialized tests should test those corner-cases.
>  export LTTNG_UST_REGISTER_TIMEOUT=-1
>
> +# We set the default lttng-sessiond path to /bin/true to prevent the spawning
> +# of a daemonized sessiond. This is necessary since 'lttng create' will spawn
> +# its own sessiond if none is running. It also make sure that 'lttng create'
> +# fails when no sessiond is running.
> +export LTTNG_SESSIOND_PATH="/bin/true"
> +
>  source $TESTDIR/utils/tap/tap.sh
>
>  function print_ok ()
> --
> 2.7.0
>



-- 
Jérémie Galarneau
EfficiOS Inc.
http://www.efficios.com