From 537fc25bac9cb926cc4f69359256d44bc7ff4c24 Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Wed, 30 Sep 2015 18:38:13 -0400 Subject: [PATCH] Tests: remove declaration already present in utils.sh MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jonathan Rajotte Signed-off-by: Jérémie Galarneau --- extras/core-handler/handler.sh | 1 - extras/core-handler/test.sh | 1 - tests/regression/tools/exclusion/test_exclusion | 1 - tests/regression/tools/filtering/test_invalid_filter | 1 - tests/regression/tools/filtering/test_unsupported_op | 1 - tests/regression/tools/filtering/test_valid_filter | 1 - tests/regression/tools/health/test_health.sh | 1 - tests/regression/tools/health/test_thread_ok | 1 - tests/regression/tools/live/test_kernel | 4 ---- tests/regression/tools/live/test_lttng_kernel | 3 --- tests/regression/tools/live/test_lttng_ust | 4 ---- tests/regression/tools/live/test_ust | 4 ---- tests/regression/tools/live/test_ust_tracefile_count | 4 ---- tests/regression/tools/mi/test_mi | 2 -- tests/regression/tools/save-load/test_autoload | 3 --- tests/regression/tools/save-load/test_load | 3 --- tests/regression/tools/save-load/test_save | 3 --- tests/regression/tools/wildcard/test_event_wildcard | 1 - tests/regression/ust/test_event_basic | 1 - tests/regression/ust/test_event_perf | 1 - tests/regression/ust/test_event_tracef | 1 - tests/stress/test_multi_sessions_per_uid_10app | 2 -- tests/stress/test_multi_sessions_per_uid_5app_streaming | 3 --- .../test_multi_sessions_per_uid_5app_streaming_kill_relayd | 3 --- 24 files changed, 50 deletions(-) diff --git a/extras/core-handler/handler.sh b/extras/core-handler/handler.sh index c2d24027b..1725a436f 100755 --- a/extras/core-handler/handler.sh +++ b/extras/core-handler/handler.sh @@ -21,7 +21,6 @@ CAT_BIN="cat" PGREP_BIN="pgrep" MKDIR_BIN="mkdir" -LTTNG_BIN="lttng" # Session name SESSION_NAME="coredump-handler" diff --git a/extras/core-handler/test.sh b/extras/core-handler/test.sh index c36fdf78c..db4e3ac05 100755 --- a/extras/core-handler/test.sh +++ b/extras/core-handler/test.sh @@ -17,7 +17,6 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # -LTTNG_BIN="lttng" SESSION_NAME="coredump-handler" diff --git a/tests/regression/tools/exclusion/test_exclusion b/tests/regression/tools/exclusion/test_exclusion index c155c25f6..949cd41df 100755 --- a/tests/regression/tools/exclusion/test_exclusion +++ b/tests/regression/tools/exclusion/test_exclusion @@ -19,7 +19,6 @@ TEST_DESC="Event exclusion" CURDIR=$(dirname $0)/ TESTDIR=$CURDIR/../../.. -LTTNG_BIN="lttng" STATS_BIN="$TESTDIR/utils/babelstats.pl" SESSION_NAME="test-exclusion" TESTAPP_PATH="$TESTDIR/utils/testapp" diff --git a/tests/regression/tools/filtering/test_invalid_filter b/tests/regression/tools/filtering/test_invalid_filter index bea173407..066a0e574 100755 --- a/tests/regression/tools/filtering/test_invalid_filter +++ b/tests/regression/tools/filtering/test_invalid_filter @@ -19,7 +19,6 @@ TEST_DESC="Filtering - Invalid filters" CURDIR=$(dirname $0)/ TESTDIR=$CURDIR/../../.. -LTTNG_BIN="lttng" SESSION_NAME="filter-invalid" EVENT_NAME="bogus" ENABLE_EVENT_STDERR="/tmp/invalid-filters-stderr" diff --git a/tests/regression/tools/filtering/test_unsupported_op b/tests/regression/tools/filtering/test_unsupported_op index 357e81c68..39d1a91b6 100755 --- a/tests/regression/tools/filtering/test_unsupported_op +++ b/tests/regression/tools/filtering/test_unsupported_op @@ -19,7 +19,6 @@ TEST_DESC="Filtering - Unsupported operators" CURDIR=$(dirname $0)/ TESTDIR=$CURDIR/../../.. -LTTNG_BIN="lttng" SESSION_NAME="filter-unsupported-ops" EVENT_NAME="bogus" ENABLE_EVENT_STDERR="/tmp/unsupported-ops-enable" diff --git a/tests/regression/tools/filtering/test_valid_filter b/tests/regression/tools/filtering/test_valid_filter index 6503cba24..2c146fe7b 100755 --- a/tests/regression/tools/filtering/test_valid_filter +++ b/tests/regression/tools/filtering/test_valid_filter @@ -19,7 +19,6 @@ TEST_DESC="Filtering - Valid filters" CURDIR=$(dirname $0)/ TESTDIR=$CURDIR/../../.. -LTTNG_BIN="lttng" STATS_BIN="$TESTDIR/utils/babelstats.pl" SESSION_NAME="valid_filter" NR_ITER=100 diff --git a/tests/regression/tools/health/test_health.sh b/tests/regression/tools/health/test_health.sh index 5fd0a7304..27571d05f 100644 --- a/tests/regression/tools/health/test_health.sh +++ b/tests/regression/tools/health/test_health.sh @@ -15,7 +15,6 @@ # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. TESTDIR=${CURDIR}/../../.. -LTTNG_BIN="lttng" UST_EVENT_NAME="tp:tptest" KERNEL_EVENT_NAME="sched_switch" CHANNEL_NAME="testchan" diff --git a/tests/regression/tools/health/test_thread_ok b/tests/regression/tools/health/test_thread_ok index 7cb845b22..dfc67cdcf 100755 --- a/tests/regression/tools/health/test_thread_ok +++ b/tests/regression/tools/health/test_thread_ok @@ -20,7 +20,6 @@ TEST_DESC="Health check - Thread OK" CURDIR=$(dirname $0)/ TESTDIR=$CURDIR/../../.. -LTTNG_BIN="lttng" SESSION_NAME="health_thread_ok" UST_EVENT_NAME="tp:tptest" KERNEL_EVENT_NAME="sched_switch" diff --git a/tests/regression/tools/live/test_kernel b/tests/regression/tools/live/test_kernel index 0e542da6a..c3a2dfc97 100755 --- a/tests/regression/tools/live/test_kernel +++ b/tests/regression/tools/live/test_kernel @@ -20,10 +20,6 @@ TEST_DESC="Live - Kernel space tracing" CURDIR=$(dirname $0)/ TESTDIR=$CURDIR/../../../ -SESSIOND_BIN="lttng-sessiond" -RELAYD_BIN="lttng-relayd" -LTTNG_BIN="lttng" -BABELTRACE_BIN="babeltrace" NR_ITER=1 NR_USEC_WAIT=1 DELAY_USEC=2000000 diff --git a/tests/regression/tools/live/test_lttng_kernel b/tests/regression/tools/live/test_lttng_kernel index 98f3b9e9d..a757ff37a 100755 --- a/tests/regression/tools/live/test_lttng_kernel +++ b/tests/regression/tools/live/test_lttng_kernel @@ -20,9 +20,6 @@ TEST_DESC="Live - Kernel space tracing" CURDIR=$(dirname $0)/ TESTDIR=$CURDIR/../../../ -SESSIOND_BIN="lttng-sessiond" -RELAYD_BIN="lttng-relayd" -LTTNG_BIN="lttng" DELAY_USEC=2000000 SESSION_NAME="live" diff --git a/tests/regression/tools/live/test_lttng_ust b/tests/regression/tools/live/test_lttng_ust index 7d6cc93f1..b9a997058 100755 --- a/tests/regression/tools/live/test_lttng_ust +++ b/tests/regression/tools/live/test_lttng_ust @@ -20,10 +20,6 @@ TEST_DESC="Live - User space tracing" CURDIR=$(dirname $0)/ TESTDIR=$CURDIR/../../../ -SESSIOND_BIN="lttng-sessiond" -RELAYD_BIN="lttng-relayd" -LTTNG_BIN="lttng" -BABELTRACE_BIN="babeltrace" NR_ITER=1 NR_USEC_WAIT=1 DELAY_USEC=2000000 diff --git a/tests/regression/tools/live/test_ust b/tests/regression/tools/live/test_ust index 0b96858aa..01494d880 100755 --- a/tests/regression/tools/live/test_ust +++ b/tests/regression/tools/live/test_ust @@ -20,10 +20,6 @@ TEST_DESC="Live - User space tracing" CURDIR=$(dirname $0)/ TESTDIR=$CURDIR/../../../ -SESSIOND_BIN="lttng-sessiond" -RELAYD_BIN="lttng-relayd" -LTTNG_BIN="lttng" -BABELTRACE_BIN="babeltrace" NR_ITER=1 NR_USEC_WAIT=1 DELAY_USEC=2000000 diff --git a/tests/regression/tools/live/test_ust_tracefile_count b/tests/regression/tools/live/test_ust_tracefile_count index 54d6a528f..6da368fc6 100755 --- a/tests/regression/tools/live/test_ust_tracefile_count +++ b/tests/regression/tools/live/test_ust_tracefile_count @@ -20,10 +20,6 @@ TEST_DESC="Live - User space tracing with tracefile_count" CURDIR=$(dirname $0)/ TESTDIR=$CURDIR/../../../ -SESSIOND_BIN="lttng-sessiond" -RELAYD_BIN="lttng-relayd" -LTTNG_BIN="lttng" -BABELTRACE_BIN="babeltrace" NR_ITER=1 NR_USEC_WAIT=1 DELAY_USEC=2000000 diff --git a/tests/regression/tools/mi/test_mi b/tests/regression/tools/mi/test_mi index 689ffa221..6a2e99a60 100755 --- a/tests/regression/tools/mi/test_mi +++ b/tests/regression/tools/mi/test_mi @@ -20,8 +20,6 @@ TEST_DESC="Machine interface testing" CURDIR=$(dirname $0)/ TESTDIR=$CURDIR/../../../ XSD_PATH=$TESTDIR/../src/common/mi-lttng-3.0.xsd -SESSIOND_BIN="lttng-sessiond" -RELAYD_BIN="lttng-relayd" #Test app for ust event TESTAPP_PATH="$TESTDIR/utils/testapp" diff --git a/tests/regression/tools/save-load/test_autoload b/tests/regression/tools/save-load/test_autoload index 35b5d7bd5..7ee5e9906 100755 --- a/tests/regression/tools/save-load/test_autoload +++ b/tests/regression/tools/save-load/test_autoload @@ -20,9 +20,6 @@ TEST_DESC="Auto load session(s)" CURDIR=$(dirname $0)/ CONFIG_DIR="${CURDIR}/configuration" TESTDIR=$CURDIR/../../../ -SESSIOND_BIN="lttng-sessiond" -RELAYD_BIN="lttng-relayd" -LTTNG_BIN="lttng" export LTTNG_SESSION_CONFIG_XSD_PATH=$(readlink -m ${TESTDIR}../src/common/config/) DIR=$(readlink -f $TESTDIR) diff --git a/tests/regression/tools/save-load/test_load b/tests/regression/tools/save-load/test_load index 2e51b2e0d..d201b53af 100755 --- a/tests/regression/tools/save-load/test_load +++ b/tests/regression/tools/save-load/test_load @@ -20,9 +20,6 @@ TEST_DESC="Load session(s)" CURDIR=$(dirname $0)/ CONFIG_DIR="${CURDIR}/configuration" TESTDIR=$CURDIR/../../../ -SESSIOND_BIN="lttng-sessiond" -RELAYD_BIN="lttng-relayd" -LTTNG_BIN="lttng" export LTTNG_SESSION_CONFIG_XSD_PATH=$(readlink -m ${TESTDIR}../src/common/config/) SESSION_NAME="load-42" diff --git a/tests/regression/tools/save-load/test_save b/tests/regression/tools/save-load/test_save index 467722e43..c5f6b1341 100755 --- a/tests/regression/tools/save-load/test_save +++ b/tests/regression/tools/save-load/test_save @@ -19,9 +19,6 @@ TEST_DESC="Save session(s)" CURDIR=$(dirname $0)/ TESTDIR=$CURDIR/../../../ -SESSIOND_BIN="lttng-sessiond" -RELAYD_BIN="lttng-relayd" -LTTNG_BIN="lttng" SESSION_NAME="save-42" CHANNEL_NAME="chan-save" diff --git a/tests/regression/tools/wildcard/test_event_wildcard b/tests/regression/tools/wildcard/test_event_wildcard index 34ee90120..61ea67a72 100755 --- a/tests/regression/tools/wildcard/test_event_wildcard +++ b/tests/regression/tools/wildcard/test_event_wildcard @@ -20,7 +20,6 @@ TEST_DESC="LTTng - Event wildcard test" CURDIR=$(dirname $0)/ TESTDIR=$CURDIR/../../.. -LTTNG_BIN="lttng" TESTAPP_PATH="$TESTDIR/utils/testapp" TESTAPP_NAME="gen-ust-events" TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME" diff --git a/tests/regression/ust/test_event_basic b/tests/regression/ust/test_event_basic index 072d74a64..9b58cb276 100755 --- a/tests/regression/ust/test_event_basic +++ b/tests/regression/ust/test_event_basic @@ -19,7 +19,6 @@ TEST_DESC="UST tracer - Basic events" CURDIR=$(dirname $0)/ TESTDIR=$CURDIR/../.. -LTTNG_BIN="lttng" BIN_NAME="gen-ust-events" SESSION_NAME="valid_filter" EVENT_NAME="tp:tptest" diff --git a/tests/regression/ust/test_event_perf b/tests/regression/ust/test_event_perf index 3328fe8f1..4e665e65e 100755 --- a/tests/regression/ust/test_event_perf +++ b/tests/regression/ust/test_event_perf @@ -20,7 +20,6 @@ TEST_DESC="UST tracer - Perf counters" CURDIR=$(dirname $0)/ TESTDIR=$CURDIR/../.. -LTTNG_BIN="lttng" SESSION_NAME="perf_counters" EVENT_NAME="tp:tptest" NUM_TESTS=24 diff --git a/tests/regression/ust/test_event_tracef b/tests/regression/ust/test_event_tracef index 1aa2ff426..6cd354a98 100755 --- a/tests/regression/ust/test_event_tracef +++ b/tests/regression/ust/test_event_tracef @@ -20,7 +20,6 @@ TEST_DESC="UST tracer - tracef events" CURDIR=$(dirname $0)/ TESTDIR=$CURDIR/../.. -LTTNG_BIN="lttng" TESTAPP_PATH="$TESTDIR/utils/testapp" TESTAPP_NAME="gen-ust-tracef" TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME" diff --git a/tests/stress/test_multi_sessions_per_uid_10app b/tests/stress/test_multi_sessions_per_uid_10app index 90ef81963..82e8ad505 100755 --- a/tests/stress/test_multi_sessions_per_uid_10app +++ b/tests/stress/test_multi_sessions_per_uid_10app @@ -57,8 +57,6 @@ function check_sessiond() function start_sessiond() { - local SESSIOND_BIN="lttng-sessiond" - validate_kernel_version if [ $? -ne 0 ]; then fail "Start session daemon" diff --git a/tests/stress/test_multi_sessions_per_uid_5app_streaming b/tests/stress/test_multi_sessions_per_uid_5app_streaming index 637624f66..ed989498d 100755 --- a/tests/stress/test_multi_sessions_per_uid_5app_streaming +++ b/tests/stress/test_multi_sessions_per_uid_5app_streaming @@ -70,8 +70,6 @@ function check_relayd() function start_sessiond() { - local SESSIOND_BIN="lttng-sessiond" - validate_kernel_version if [ $? -ne 0 ]; then fail "Start session daemon" @@ -90,7 +88,6 @@ function start_sessiond() function start_relayd { local opt=$1 - local RELAYD_BIN="lttng-relayd" if [ -z $(pgrep --full lt-$RELAYD_BIN) ]; then $TESTDIR/../src/bin/lttng-relayd/$RELAYD_BIN $opt >$LOG_FILE_RELAYD 2>&1 & diff --git a/tests/stress/test_multi_sessions_per_uid_5app_streaming_kill_relayd b/tests/stress/test_multi_sessions_per_uid_5app_streaming_kill_relayd index 00778f83a..c699ac226 100755 --- a/tests/stress/test_multi_sessions_per_uid_5app_streaming_kill_relayd +++ b/tests/stress/test_multi_sessions_per_uid_5app_streaming_kill_relayd @@ -57,8 +57,6 @@ function check_sessiond() function start_sessiond() { - local SESSIOND_BIN="lttng-sessiond" - validate_kernel_version if [ $? -ne 0 ]; then fail "Start session daemon" @@ -79,7 +77,6 @@ function start_sessiond() function start_relayd { local opt=$1 - local RELAYD_BIN="lttng-relayd" if [ -z $(pgrep --full lt-$RELAYD_BIN) ]; then $TESTDIR/../src/bin/lttng-relayd/$RELAYD_BIN $opt >$LOG_FILE_RELAYD 2>&1 & -- 2.34.1