#!/bin/bash
#
+# Copyright (C) - 2015 Philippe Proulx <pproulx@efficios.com>
# Copyright (C) - 2014 David Goulet <dgoulet@efficios.com>
#
# This program is free software; you can redistribute it and/or modify it under
# this program; if not, write to the Free Software Foundation, Inc., 51
# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-TEST_DESC="Java Python support"
+TEST_DESC="Python support"
CURDIR=$(dirname $0)/
TESTDIR=$CURDIR/../../..
NR_ITER=5
NR_SEC_WAIT=1
-TESTAPP_NAME="LTTngTest"
+TESTAPP_NAME="test"
TESTAPP_BIN="$TESTAPP_NAME.py"
TESTAPP_PATH="$CURDIR"
SESSION_NAME="python-test"
EVENT_NAME2="python-ev-test2"
OUTPUT_DEST="/dev/null"
-NUM_TESTS=156
+NUM_TESTS=310
source $TESTDIR/utils/utils.sh
function run_app
{
- local debug_tp=$1
- local fire_second_tp=$2
+ local python=$1
+ local debug_tp=$2
+ local fire_second_tp=$3
- python $TESTAPP_PATH/$TESTAPP_BIN $NR_ITER $NR_SEC_WAIT $debug_tp $fire_second_tp
+ $python $TESTAPP_PATH/$TESTAPP_BIN $NR_ITER $NR_SEC_WAIT $debug_tp $fire_second_tp
}
function run_app_background
enable_python_lttng_event $SESSION_NAME $EVENT_NAME
# Run 5 times with a 1 second delay
- run_app_background
+ run_app_background $1
start_lttng_tracing_ok $SESSION_NAME
start_lttng_tracing_ok $SESSION_NAME
# Run 5 times with a 1 second delay
- run_app
+ run_app $1
stop_lttng_tracing_ok $SESSION_NAME
destroy_lttng_session_ok $SESSION_NAME
start_lttng_tracing_ok $SESSION_NAME
# Run 5 times with a 1 second delay
- run_app
+ run_app $1
stop_lttng_tracing_ok $SESSION_NAME
destroy_lttng_session_ok $SESSION_NAME
start_lttng_tracing_ok $SESSION_NAME
# Run 5 times with a 1 second delay
- run_app
+ run_app $1
stop_lttng_tracing_ok $SESSION_NAME
destroy_lttng_session_ok $SESSION_NAME
start_lttng_tracing_ok $SESSION_NAME
# Run 5 times with a 1 second delay
- run_app
+ run_app $1
stop_lttng_tracing_ok $SESSION_NAME
destroy_lttng_session_ok $SESSION_NAME
start_lttng_tracing_ok $SESSION_NAME
# Run 5 times with a 1 second delay and fire two TP.
- run_app 1
+ run_app $1 1
stop_lttng_tracing_ok $SESSION_NAME
destroy_lttng_session_ok $SESSION_NAME
start_lttng_tracing_ok $SESSION_NAME
# Run 5 times with a 1 second delay and fire two TP.
- run_app 1
+ run_app $1 1
stop_lttng_tracing_ok $SESSION_NAME
destroy_lttng_session_ok $SESSION_NAME
start_lttng_tracing_ok $SESSION_NAME-2
# Run 5 times with a 1 second delay and fire second TP.
- run_app 1 1
+ run_app $1 1 1
stop_lttng_tracing_ok $SESSION_NAME-1
stop_lttng_tracing_ok $SESSION_NAME-2
start_lttng_tracing_ok $SESSION_NAME-2
# Run 5 times with a 1 second delay and fire second TP.
- run_app 0 1
+ run_app $1 0 1
stop_lttng_tracing_ok $SESSION_NAME-1
stop_lttng_tracing_ok $SESSION_NAME-2
start_lttng_tracing_ok $SESSION_NAME-1
start_lttng_tracing_ok $SESSION_NAME-2
- run_app
+ run_app $1
stop_lttng_tracing_ok $SESSION_NAME-1
stop_lttng_tracing_ok $SESSION_NAME-2
start_lttng_tracing_ok $SESSION_NAME
- run_app 0 1
+ run_app $1 0 1
stop_lttng_tracing_ok $SESSION_NAME
destroy_lttng_session_ok $SESSION_NAME
start_lttng_tracing_ok $SESSION_NAME-2
# Run 5 times with a 1 second delay and fire second TP.
- run_app 0 1
+ run_app $1 0 1
stop_lttng_tracing_ok $SESSION_NAME-1
stop_lttng_tracing_ok $SESSION_NAME-2
start_lttng_tracing_ok $SESSION_NAME
# Run 5 times with a 1 second delay
- run_app_background 0 1
+ run_app_background $1 0 1
# Wait for the applications started in background
wait
start_lttng_tracing_ok $SESSION_NAME
# Run 5 times with a 1 second delay
- run_app_background 0 1
+ run_app_background $1 0 1
# Wait for the applications started in background
wait
create_lttng_session_ok $SESSION_NAME $TRACE_PATH/$SESSION_NAME
# Enable all event with a filter.
- enable_python_filter $SESSION_NAME '*' 'msg == "python-ev-test2 fired"'
+ enable_python_filter $SESSION_NAME '*' 'msg == "python-ev-test2 fired [INFO]"'
start_lttng_tracing_ok $SESSION_NAME
# Run 5 times with a 1 second delay and fire second TP.
- run_app 0 1
+ run_app $1 0 1
stop_lttng_tracing_ok $SESSION_NAME
destroy_lttng_session_ok $SESSION_NAME
create_lttng_session_ok $SESSION_NAME $TRACE_PATH/$SESSION_NAME
# Enable first Logger but filter msg payload for the INFO one while
# triggering the debug and second TP.
- enable_python_filter $SESSION_NAME $EVENT_NAME 'msg == "python-ev-test1 fired"'
+ enable_python_filter $SESSION_NAME $EVENT_NAME 'msg == "python-ev-test1 fired" [INFO]'
start_lttng_tracing_ok $SESSION_NAME
# Run 5 times with a 1 second delay, fire debug and second TP.
- run_app 1 1
+ run_app $1 1 1
stop_lttng_tracing_ok $SESSION_NAME
destroy_lttng_session_ok $SESSION_NAME
start_lttng_tracing_ok $SESSION_NAME
# Run 5 times with a 1 second delay and fire second TP.
- run_app 0 1
+ run_app $1 0 1
stop_lttng_tracing_ok $SESSION_NAME
destroy_lttng_session_ok $SESSION_NAME
start_lttng_tracing_ok $SESSION_NAME
# Run 5 times with a 1 second delay and fire second TP.
- run_app 0 1
+ run_app $1 0 1
stop_lttng_tracing_ok $SESSION_NAME
destroy_lttng_session_ok $SESSION_NAME
start_lttng_tracing_ok $SESSION_NAME
# Run 5 times with a 1 second delay and fire second TP.
- run_app 0 1
+ run_app $1 0 1
stop_lttng_tracing_ok $SESSION_NAME
destroy_lttng_session_ok $SESSION_NAME
test_python_filter_loglevel
)
- for fct_test in ${tests[@]};
+ for python_version in 2 3;
do
- TRACE_PATH=$(mktemp -d)
-
- ${fct_test}
- if [ $? -ne 0 ]; then
- break;
- fi
- rm -rf $TRACE_PATH
+ for fct_test in ${tests[@]};
+ do
+ TRACE_PATH=$(mktemp -d)
+
+ diag "(Python $python_version)"
+ ${fct_test} python$python_version
+ if [ $? -ne 0 ]; then
+ break;
+ fi
+ rm -rf $TRACE_PATH
+ done
done
stop_lttng_sessiond