Skip to contentSkip to conversation

Add --with-lttng-ust-prefix config option.

PATCH New Stefan Seefeld 2 participants 3 messages Sep 16, 2013 – Sep 17, 2013 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

PATCH 1/2 Add --with-lttng-ust-prefix config option.

From: Stefan Seefeld <[email protected]>

---
 configure.ac | 9 +++++++++
 1 file changed, 9 insertions(+)
configure.ac +9 -0
index f5f4b26..f4d5ad4 100644
@@ -196,6 +196,15 @@ AC_ARG_WITH(lttng-ust-prefix,
 		    LDFLAGS="$LDFLAGS -L${withval}/lib64 -L${withval}/lib"
 		  ])
 
+AC_ARG_WITH(lttng-ust-prefix,
+  AS_HELP_STRING([--with-lttng-ust-prefix=PATH],
+                 [Specify the installation prefix of the lttng-ust library.
+	          Headers must be in PATH/include; libraries in PATH/lib.]),
+		  [
+		    CPPFLAGS="$CPPFLAGS -I${withval}/include"
+		    LDFLAGS="$LDFLAGS -L${withval}/lib64 -L${withval}/lib"
+		  ])
+
 # Check liblttng-ust-ctl library
 AC_ARG_ENABLE(lttng-ust,
 	AS_HELP_STRING([--disable-lttng-ust],[build without LTTng-UST (Userspace Tracing) support]),
Signature · 1 line
1.8.3.1
#2 lore raw

PATCH 2/2 Robustify tests.

In reply to a message not in the archive
---
 tests/Makefile.am                                  |  5 ++
 .../regression/tools/filtering/test_invalid_filter |  3 +-
 .../regression/tools/filtering/test_unsupported_op |  3 +-
 tests/regression/tools/filtering/test_valid_filter |  3 +-
 tests/regression/tools/health/test_thread_exit     |  1 -
 tests/regression/tools/health/test_thread_stall    |  1 -
 .../tools/snapshots/test_kernel_streaming          |  2 +-
 tests/regression/tools/snapshots/test_ust          |  2 +-
 .../regression/tools/snapshots/test_ust_streaming  |  2 +-
 .../tools/streaming/test_high_throughput_limits    |  2 +-
 tests/regression/tools/streaming/test_kernel       |  2 +-
 tests/regression/tools/streaming/test_ust          |  2 +-
 .../tools/tracefile-limits/test_tracefile_count    |  4 +-
 .../tools/tracefile-limits/test_tracefile_size     |  4 +-
 tests/regression/ust/buffers-pid/test_buffers_pid  | 12 ++--
 tests/regression/ust/daemon/test_daemon            |  4 +-
 tests/regression/ust/exit-fast/test_exit-fast      |  4 +-
 tests/regression/ust/fork/test_fork                |  4 +-
 .../regression/ust/libc-wrapper/test_libc-wrapper  |  4 +-
 tests/regression/ust/linking/test_linking          |  4 +-
 tests/regression/ust/nprocesses/test_nprocesses    |  2 +-
 tests/regression/ust/overlap/test_overlap          |  2 +-
 .../test_periodical_metadata_flush                 |  8 +--
 tests/regression/ust/test_event_basic              |  7 +--
 tests/regression/ust/test_event_wildcard           |  1 -
 tests/run.sh                                       |  2 +-
 tests/utils/utils.sh                               | 72 ++++++++++------------
 27 files changed, 73 insertions(+), 89 deletions(-)
tests/Makefile.am +5 -0
index c14e733..fb30b8e 100644
@@ -1,5 +1,9 @@
 SUBDIRS = utils regression unit stress
 
+bindir := $(top_builddir)/src/bin
+local_path := $(bindir)/lttng:$(bindir)/lttng-consumerd:$(bindir)/lttng-relayd
+
+installcheck-am: export PATH := "$(prefix)/bin:$(PATH)"
 installcheck-am:
 	./run.sh unit_tests
 	./run.sh fast_regression
@@ -7,6 +11,7 @@ if USE_PYTHON
 	./run.sh with_bindings_regression
 endif
 
+check-am: export PATH := "$(local_path):$(PATH)"
 check-am:
 	./run.sh unit_tests
 	./run.sh fast_regression
tests/regression/tools/filtering/test_invalid_filter +1 -2
index 5e096a5..891c7c1 100755
@@ -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"
@@ -34,7 +33,7 @@ function enable_ust_lttng_event_filter
 	event_name="$2"
 	filter="$3"
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event $event_name -s $sess_name -u --filter "$filter" 2> $ENABLE_EVENT_STDERR 1> /dev/null
+	lttng enable-event $event_name -s $sess_name -u --filter "$filter" 2> $ENABLE_EVENT_STDERR 1> /dev/null
 
 	# Enable must fail
 	if [ $? -eq 0 ]; then
tests/regression/tools/filtering/test_unsupported_op +1 -2
index b5b7f27..bc9bd51 100755
@@ -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"
@@ -33,7 +32,7 @@ function enable_ust_lttng_event_filter_unsupported
 	event_name=$2
 	filter=$3
 
-	enable_cmd="$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event"
+	enable_cmd="lttng enable-event"
 	$enable_cmd $event_name -s $sess_name -u --filter "$filter" 2> $ENABLE_EVENT_STDERR 1> /dev/null
 
 	# Enable must fail
tests/regression/tools/filtering/test_valid_filter +1 -2
index a62cc1e..ef6a013 100755
@@ -19,7 +19,6 @@ TEST_DESC="Filtering - Valid filters"
 
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../..
-LTTNG_BIN="lttng"
 BIN_NAME="gen-ust-events"
 STATS_BIN="$TESTDIR/utils/babelstats.pl"
 SESSION_NAME="valid_filter"
@@ -39,7 +38,7 @@ function enable_ust_lttng_event_filter()
 	event_name="$2"
 	filter="$3"
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event $event_name -s $sess_name -u --filter "$filter" 2>&1 >/dev/null
+	lttng enable-event $event_name -s $sess_name -u --filter "$filter" 2>&1 >/dev/null
 
 	ok $? "Enable lttng event with filtering"
 }
tests/regression/tools/health/test_thread_exit +0 -1
index b4fc73d..35fe42e 100755
@@ -19,7 +19,6 @@ TEST_DESC="Health check - Thread exit"
 
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../..
-LTTNG_BIN="lttng"
 SESSION_NAME="health_thread_exit"
 EVENT_NAME="bogus"
 HEALTH_CHECK_BIN="health_check"
tests/regression/tools/health/test_thread_stall +0 -1
index ddaab95..9055499 100755
@@ -19,7 +19,6 @@ TEST_DESC="Health check - Thread stall"
 
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../..
-LTTNG_BIN="lttng"
 SESSION_NAME="health_thread_stall"
 EVENT_NAME="bogus"
 HEALTH_CHECK_BIN="health_check"
tests/regression/tools/snapshots/test_kernel_streaming +1 -1
index f28adaa..fc170a4 100755
@@ -46,7 +46,7 @@ function snapshot_add_output ()
 		extra_opt="-n $name"
 	fi
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot add-output -s $sess_name $extra_opt $trace_path >/dev/null 2>&1
+	lttng snapshot add-output -s $sess_name $extra_opt $trace_path >/dev/null 2>&1
 	ok $? "Added snapshot output $trace_path"
 }
 
tests/regression/tools/snapshots/test_ust +1 -1
index c88e98a..8d01b33 100755
@@ -99,7 +99,7 @@ function enable_channel_per_uid_mmap_overwrite()
 	sess_name=$1
 	channel_name=$2
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel --buffers-uid -u $channel_name -s $sess_name --output mmap --overwrite >/dev/null 2>&1
+	lttng enable-channel --buffers-uid -u $channel_name -s $sess_name --output mmap --overwrite >/dev/null 2>&1
 	ok $? "Enable channel $channel_name per UID for session $sess_name"
 }
 
tests/regression/tools/snapshots/test_ust_streaming +1 -1
index 3aa3858..c3a9e57 100755
@@ -50,7 +50,7 @@ function snapshot_add_output ()
 		extra_opt="-n $name"
 	fi
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot add-output -s $sess_name $extra_opt $trace_path >/dev/null 2>&1
+	lttng snapshot add-output -s $sess_name $extra_opt $trace_path >/dev/null 2>&1
 	ok $? "Added snapshot output $trace_path"
 }
 
tests/regression/tools/streaming/test_high_throughput_limits +1 -1
index b2c8864..671481f 100755
@@ -80,7 +80,7 @@ function create_lttng_session_with_uri
 	sess_name=$1
 	uri=$2
 	# Create session with custom URI
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN create -U $uri $sess_name >/dev/null 2>&1
+	lttng create -U $uri $sess_name >/dev/null 2>&1
 	ok $? "Create session with uri $uri"
 }
 
tests/regression/tools/streaming/test_kernel +1 -1
index 9877bb8..dd20ed7 100755
@@ -37,7 +37,7 @@ fi
 function lttng_create_session_uri
 {
 	# Create session with default path
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN create $SESSION_NAME -U net://localhost >/dev/null 2>&1
+	lttng create $SESSION_NAME -U net://localhost >/dev/null 2>&1
 
 	ok $? "Create session $SESSION_NAME"
 }
tests/regression/tools/streaming/test_ust +1 -1
index 785a9a8..d87061d 100755
@@ -40,7 +40,7 @@ fi
 function lttng_create_session_uri
 {
 	# Create session with default path
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN create $SESSION_NAME -U net://localhost >/dev/null 2>&1
+	lttng create $SESSION_NAME -U net://localhost >/dev/null 2>&1
 	ok $? "Create session with default path"
 }
 
tests/regression/tools/tracefile-limits/test_tracefile_count +2 -2
index 0c23d84..f905a7b 100755
@@ -53,7 +53,7 @@ function enable_lttng_channel_count_limit ()
 	test_name+="for session $sess_name: "
 	test_name+="$tracefile_count_limit tracefiles"
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel \
+	lttng enable-channel \
 	    -u $channel_name -s $sess_name \
 	    -C 4096 -W $tracefile_count_limit \
 	    --overwrite >/dev/null 2>&1
@@ -71,7 +71,7 @@ function enable_ust_lttng_event_per_channel ()
 	test_name+="for session $sess_name "
 	test_name+="in channel $channel_name"
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" \
+	lttng enable-event "$event_name" \
 	    -s $sess_name -u -c $channel_name >/dev/null 2>&1
 
 	ok $? "$test_name"
tests/regression/tools/tracefile-limits/test_tracefile_size +2 -2
index ed58e70..bd87471 100755
@@ -52,7 +52,7 @@ function enable_lttng_channel_size_limit ()
 	test_name+="for session $sess_name: "
 	test_name+="$tracefile_size_limit bytes tracefile limit"
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel \
+	lttng enable-channel \
 	    -u $channel_name -s $sess_name --buffers-pid \
 	    -C $tracefile_size_limit >/dev/null 2>&1
 
@@ -69,7 +69,7 @@ function enable_ust_lttng_event_per_channel ()
 	test_name+="for session $sess_name "
 	test_name+="in channel $channel_name"
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" \
+	lttng enable-event "$event_name" \
 	    -s $sess_name -u -c $channel_name >/dev/null 2>&1
 
 	ok $? "$test_name"
tests/regression/ust/buffers-pid/test_buffers_pid +6 -6
index 2d227bf..27b7a02 100755
@@ -41,7 +41,7 @@ function enable_channel_per_pid()
 	sess_name=$1
 	channel_name=$2
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel --buffers-pid -u $channel_name -s $sess_name >/dev/null 2>&1
+	lttng enable-channel --buffers-pid -u $channel_name -s $sess_name >/dev/null 2>&1
 	ok $? "Enable channel $channel_name per PID for session $sess_name"
 }
 
@@ -189,15 +189,15 @@ test_multiple_channels() {
 	enable_channel_per_pid $SESSION_NAME "channel3"
 	enable_channel_per_pid $SESSION_NAME "channel4"
 	# Enable event in all channels.
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event $EVENT_NAME -c channel0 -s $SESSION_NAME -u >/dev/null 2>&1
+	lttng enable-event $EVENT_NAME -c channel0 -s $SESSION_NAME -u >/dev/null 2>&1
 	ok $? "Enable event $EVENT_NAME for session $SESSION_NAME in channel0"
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event $EVENT_NAME -c channel1 -s $SESSION_NAME -u >/dev/null 2>&1
+	lttng enable-event $EVENT_NAME -c channel1 -s $SESSION_NAME -u >/dev/null 2>&1
 	ok $? "Enable event $EVENT_NAME for session $SESSION_NAME in channel1"
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event $EVENT_NAME -c channel2 -s $SESSION_NAME -u >/dev/null 2>&1
+	lttng enable-event $EVENT_NAME -c channel2 -s $SESSION_NAME -u >/dev/null 2>&1
 	ok $? "Enable event $EVENT_NAME for session $SESSION_NAME in channel2"
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event $EVENT_NAME -c channel3 -s $SESSION_NAME -u >/dev/null 2>&1
+	lttng enable-event $EVENT_NAME -c channel3 -s $SESSION_NAME -u >/dev/null 2>&1
 	ok $? "Enable event $EVENT_NAME for session $SESSION_NAME in channel3"
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event $EVENT_NAME -c channel4 -s $SESSION_NAME -u >/dev/null 2>&1
+	lttng enable-event $EVENT_NAME -c channel4 -s $SESSION_NAME -u >/dev/null 2>&1
 	ok $? "Enable event $EVENT_NAME for session $SESSION_NAME in channel4"
 	start_lttng_tracing $SESSION_NAME
 
tests/regression/ust/daemon/test_daemon +1 -3
index 54afd0c..bfd9dc7 100755
@@ -20,12 +20,10 @@
 STOP_SESSIOND=$?
 
 CURDIR=$(dirname $0)
-TESTDIR=${CURDIR}/../../..
 
 # Try to launch a sessiond before invoking the python test script
 if [ $STOP_SESSIOND -ne 0 ]; then
-	DIR=$(readlink -f ${TESTDIR})
-	${DIR}/../src/bin/lttng-sessiond/lttng-sessiond --daemonize --quiet --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd"
+        lttng-sessiond --daemonize --quiet
 fi
 
 python3 ${CURDIR}/test_daemon.py
tests/regression/ust/exit-fast/test_exit-fast +1 -3
index e8a0bd6..d0d8da4 100755
@@ -20,12 +20,10 @@
 STOP_SESSIOND=$?
 
 CURDIR=$(dirname $0)
-TESTDIR=${CURDIR}/../../..
 
 # Try to launch a sessiond before invoking the python test script
 if [ $STOP_SESSIOND -ne 0 ]; then
-	DIR=$(readlink -f ${TESTDIR})
-	${DIR}/../src/bin/lttng-sessiond/lttng-sessiond --daemonize --quiet --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd"
+	lttng-sessiond --daemonize --quiet
 fi
 
 python3 ${CURDIR}/test_exit-fast.py
tests/regression/ust/fork/test_fork +1 -3
index e05b556..44a4591 100755
@@ -20,12 +20,10 @@
 STOP_SESSIOND=$?
 
 CURDIR=$(dirname $0)
-TESTDIR=${CURDIR}/../../..
 
 # Try to launch a sessiond before invoking the python test script
 if [ $STOP_SESSIOND -ne 0 ]; then
-	DIR=$(readlink -f ${TESTDIR})
-	${DIR}/../src/bin/lttng-sessiond/lttng-sessiond --daemonize --quiet --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd"
+	lttng-sessiond --daemonize --quiet
 fi
 
 python3 ${CURDIR}/test_fork.py
tests/regression/ust/libc-wrapper/test_libc-wrapper +1 -3
index 8c6b128..3d53676 100755
@@ -20,12 +20,10 @@
 STOP_SESSIOND=$?
 
 CURDIR=$(dirname $0)
-TESTDIR=${CURDIR}/../../..
 
 # Try to launch a sessiond before invoking the python test script
 if [ $STOP_SESSIOND -ne 0 ]; then
-	DIR=$(readlink -f ${TESTDIR})
-	${DIR}/../src/bin/lttng-sessiond/lttng-sessiond --daemonize --quiet --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd"
+	lttng-sessiond --daemonize --quiet
 fi
 
 python3 ${CURDIR}/test_libc-wrapper.py
tests/regression/ust/linking/test_linking +1 -3
index 77e0b82..7c8bbf6 100755
@@ -20,12 +20,10 @@
 STOP_SESSIOND=$?
 
 CURDIR=$(dirname $0)
-TESTDIR=${CURDIR}/../../..
 
 # Try to launch a sessiond before invoking the python test script
 if [ $STOP_SESSIOND -ne 0 ]; then
-	DIR=$(readlink -f ${TESTDIR})
-	${DIR}/../src/bin/lttng-sessiond/lttng-sessiond --daemonize --quiet --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd"
+	lttng-sessiond --daemonize --quiet
 fi
 
 python3 ${CURDIR}/test_linking.py
tests/regression/ust/nprocesses/test_nprocesses +1 -1
index 1660c21..19e8d40 100755
@@ -52,7 +52,7 @@ done
 
 reg_app_count=0
 while [ $reg_app_count -ne $NUM_PROCESS ]; do
-	listing=$($TESTDIR/../src/bin/lttng/$LTTNG_BIN list -u)
+	listing=$(lttng list -u)
 	reg_app_count=$(echo -n $listing | sed "s#$TESTAPP_BIN#$TESTAPP_BIN\n#g" | grep "$TESTAPP_BIN" | wc -l)
 done
 
tests/regression/ust/overlap/test_overlap +1 -1
index add8ff1..2369e8a 100755
@@ -300,7 +300,7 @@ test_enable_same_wildcard_filter_2()
 	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1"
 
 	# Enabling the same events with same filters should fail. This one is expected to fail.
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_wild2" -s $SESSION_NAME -u --filter "1==1" >/dev/null 2>&1
+	lttng enable-event "$event_wild2" -s $SESSION_NAME -u --filter "1==1" >/dev/null 2>&1
 	if [ $? -ne 0 ]; then
 	    pass "Enable event $event_name with filtering for session $sess_name twice failure detected"
 	else
tests/regression/ust/periodical-metadata-flush/test_periodical_metadata_flush +4 -4
index ad9d33d..9760e36 100755
@@ -41,7 +41,7 @@ function enable_channel_per_uid()
 	local sess_name=$1
 	local channel_name=$2
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel --buffers-uid -u $channel_name -s $sess_name --switch-timer 100000 >/dev/null 2>&1
+	lttng enable-channel --buffers-uid -u $channel_name -s $sess_name --switch-timer 100000 >/dev/null 2>&1
 	ok $? "Enable channel $channel_name per UID for session $sess_name"
 }
 
@@ -50,7 +50,7 @@ function enable_channel_per_pid()
 	local sess_name=$1
 	local channel_name=$2
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel --buffers-pid -u $channel_name -s $sess_name --switch-timer 100000 >/dev/null 2>&1
+	lttng enable-channel --buffers-pid -u $channel_name -s $sess_name --switch-timer 100000 >/dev/null 2>&1
 	ok $? "Enable channel $channel_name per UID for session $sess_name"
 }
 
@@ -59,7 +59,7 @@ function enable_metadata_per_uid()
 	local sess_name=$1
 	local channel_name="metadata"
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel --buffers-uid -u $channel_name -s $sess_name --switch-timer 200000 >/dev/null 2>&1
+	lttng enable-channel --buffers-uid -u $channel_name -s $sess_name --switch-timer 200000 >/dev/null 2>&1
 	ok $? "Enable channel $channel_name per UID for session $sess_name"
 }
 
@@ -68,7 +68,7 @@ function enable_metadata_per_pid()
 	local sess_name=$1
 	local channel_name="metadata"
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel --buffers-pid -u $channel_name -s $sess_name --switch-timer 200000 >/dev/null 2>&1
+	lttng enable-channel --buffers-pid -u $channel_name -s $sess_name --switch-timer 200000 >/dev/null 2>&1
 	ok $? "Enable channel $channel_name per PID for session $sess_name"
 }
 
tests/regression/ust/test_event_basic +3 -4
index 3ff91b3..9af5040 100755
@@ -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"
@@ -33,7 +32,7 @@ function enable_ust_lttng_event_per_chan()
 	event_name="$2"
 	chan_name="$3"
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -c $chan_name -u >/dev/null 2>&1
+	lttng enable-event "$event_name" -s $sess_name -c $chan_name -u >/dev/null 2>&1
 	ok $? "Enable event $event_name for session $sess_name in channel $chan_name"
 }
 
@@ -43,7 +42,7 @@ function disable_ust_lttng_event_per_chan()
 	event_name="$2"
 	chan_name="$3"
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-event "$event_name" -s $sess_name -c $chan_name -u >/dev/null 2>&1
+	lttng disable-event "$event_name" -s $sess_name -c $chan_name -u >/dev/null 2>&1
 	ok $? "Disable event $event_name for session $sess_name in channel $chan_name"
 }
 
@@ -53,7 +52,7 @@ function add_ust_lttng_context()
 	chan_name="$2"
 	type="$3"
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN add-context -s $sess_name -c $chan_name -t $type -u >/dev/null 2>&1
+	lttng add-context -s $sess_name -c $chan_name -t $type -u >/dev/null 2>&1
 	ok $? "Add context $type for session $sess_name in channel $chan_name"
 }
 
tests/regression/ust/test_event_wildcard +0 -1
index 33ba4c4..743bac0 100755
@@ -19,7 +19,6 @@ TEST_DESC="UST tracer - Event wildcard"
 
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../..
-LTTNG_BIN="lttng"
 BIN_NAME="gen-ust-events"
 SESSION_NAME="valid_filter"
 EVENT_NAME="tp:tptest"
tests/run.sh +1 -1
index c6c50fd..86c7695 100755
@@ -19,4 +19,4 @@
 
 [ -z "$1" ] && echo "Error: No testlist. Please specify a testlist to run." && exit 1
 
-prove --merge --exec '' - < $1
+prove --merge -v --exec '' - < $1
tests/utils/utils.sh +34 -38

242 lines not on this page · raw message

Signature · 1 line
1.8.3.1
#3 lore raw

Re: [PATCH lttng-tools 0/2] Improve testing.

In reply to a message not in the archive

Hi Stefan!

So, two things I observed here. First, the kill* command from utils.sh now fails because they use "lt-lttng-*" rather then "lttng-*". Changing that fixes the issue.

The second thing, the verbose mode is active for the tests now. Is it something you forgot to remove or is there a purpose?

Cheers!
David

Stefan Seefeld:

Quoted 42 lines

The first of these two patches is a minor improvement I had meant to send out much earlier. It allows to configure / build against an lttng-ust in a non-default location.

The second patch follows up on our previous discussion about support for 'make check' vs. 'make installcheck'. It sets the PATH variable appropriately from within the Makefile, and then removes the hard-coding from the various tests and support scripts.

Stefan Seefeld (2):
Add --with-lttng-ust-prefix config option.
Robustify tests.

 configure.ac                                       |  9 +++
 tests/Makefile.am                                  |  5 ++
 .../regression/tools/filtering/test_invalid_filter |  3 +-
 .../regression/tools/filtering/test_unsupported_op |  3 +-
 tests/regression/tools/filtering/test_valid_filter |  3 +-
 tests/regression/tools/health/test_thread_exit     |  1 -
 tests/regression/tools/health/test_thread_stall    |  1 -
 .../tools/snapshots/test_kernel_streaming          |  2 +-
 tests/regression/tools/snapshots/test_ust          |  2 +-
 .../regression/tools/snapshots/test_ust_streaming  |  2 +-
 .../tools/streaming/test_high_throughput_limits    |  2 +-
 tests/regression/tools/streaming/test_kernel       |  2 +-
 tests/regression/tools/streaming/test_ust          |  2 +-
 .../tools/tracefile-limits/test_tracefile_count    |  4 +-
 .../tools/tracefile-limits/test_tracefile_size     |  4 +-
 tests/regression/ust/buffers-pid/test_buffers_pid  | 12 ++--
 tests/regression/ust/daemon/test_daemon            |  4 +-
 tests/regression/ust/exit-fast/test_exit-fast      |  4 +-
 tests/regression/ust/fork/test_fork                |  4 +-
 .../regression/ust/libc-wrapper/test_libc-wrapper  |  4 +-
 tests/regression/ust/linking/test_linking          |  4 +-
 tests/regression/ust/nprocesses/test_nprocesses    |  2 +-
 tests/regression/ust/overlap/test_overlap          |  2 +-
 .../test_periodical_metadata_flush                 |  8 +--
 tests/regression/ust/test_event_basic              |  7 +--
 tests/regression/ust/test_event_wildcard           |  1 -
 tests/run.sh                                       |  2 +-
 tests/utils/utils.sh                               | 72 ++++++++++------------
 28 files changed, 82 insertions(+), 89 deletions(-)