X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=52c2f6badb9d50d46c1116d4c5b20be689dc97e4;hp=2cadd58002907605e0ee6cb01b315f8cc2d4c246;hb=512eb1488340c4c3c0c29e6cde9d489e858fdd6c;hpb=8490897a08bcb2e38d78ccae01fe00e50f2f8bd8

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 2cadd5800..52c2f6bad 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -16,6 +16,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
 SESSIOND_BIN="lttng-sessiond"
+RUNAS_BIN="lttng-runas"
 CONSUMERD_BIN="lttng-consumerd"
 RELAYD_BIN="lttng-relayd"
 LTTNG_BIN="lttng"
@@ -411,7 +412,7 @@ function stop_lttng_sessiond_opt()
 		return
 	fi
 
-	PID_SESSIOND=`pgrep --full lt-$SESSIOND_BIN`
+	PID_SESSIOND="$(pgrep --full lt-$SESSIOND_BIN) $(pgrep --full $RUNAS_BIN)"
 
 	if [ -n "$2" ]; then
 		kill_opt="$kill_opt -s $signal"
@@ -463,7 +464,7 @@ function sigstop_lttng_sessiond_opt()
 		return
 	fi
 
-	PID_SESSIOND=`pgrep --full lt-$SESSIOND_BIN`
+	PID_SESSIOND="$(pgrep --full lt-$SESSIOND_BIN) $(pgrep --full $RUNAS_BIN)"
 
 	kill_opt="$kill_opt -s $signal"
 
@@ -1308,3 +1309,37 @@ function validate_trace_empty()
 	ret=$?
 	return $ret
 }
+
+function metadata_regenerate ()
+{
+	local expected_to_fail=$1
+	local sess_name=$2
+
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN metadata regenerate -s $sess_name 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
+	ret=$?
+	if [[ $expected_to_fail -eq "1" ]]; then
+		test "$ret" -ne "0"
+		ok $? "Expected fail on regenerate $sess_name"
+	else
+		ok $ret "Metadata regenerate $sess_name"
+	fi
+}
+
+function metadata_regenerate_ok ()
+{
+	metadata_regenerate 0 "$@"
+}
+
+function metadata_regenerate_fail ()
+{
+	metadata_regenerate 1 "$@"
+}
+
+function destructive_tests_enabled ()
+{
+	if [ ${LTTNG_ENABLE_DESTRUCTIVE_TESTS} = "will-break-my-system" ]; then
+		return 0
+	else
+		return 1
+	fi
+}