From: Michael Jeanson <mjeanson@efficios.com>
Date: Thu, 9 Jun 2016 16:21:31 +0000 (-0400)
Subject: Tests: Make warn_processes.sh more portable
X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=commitdiff_plain;h=4c2eee7f21682b9b4ea1311ec8d86ad1f877daf9;hp=98c781ff7ebdf6430228c5128dd706ee37532d79

Tests: Make warn_processes.sh more portable

Options to pgrep aren't standardised across coreutils
implementations, use a more common option.

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 58caeb159..3600e99d8 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -5,7 +5,7 @@ if BUILD_TESTS
 SUBDIRS += . utils regression unit stress destructive
 if HAS_PGREP
 check-am:
-	$(top_srcdir)/tests/utils/warn_lttng_processes.sh $(PGREP)
+	$(top_srcdir)/tests/utils/warn_processes.sh $(PGREP)
 endif
 else
 	@echo "========================================="
diff --git a/tests/utils/Makefile.am b/tests/utils/Makefile.am
index bd79d20e3..9d327e0ec 100644
--- a/tests/utils/Makefile.am
+++ b/tests/utils/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = . tap testapp
 
-EXTRA_DIST = utils.sh test_utils.py babelstats.pl warn_lttng_processes.sh
+EXTRA_DIST = utils.sh test_utils.py babelstats.pl warn_processes.sh
 dist_noinst_SCRIPTS = utils.sh test_utils.py babelstats.pl
 noinst_LTLIBRARIES = libtestutils.la
 
diff --git a/tests/utils/warn_lttng_processes.sh b/tests/utils/warn_lttng_processes.sh
deleted file mode 100755
index 939163b39..000000000
--- a/tests/utils/warn_lttng_processes.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-if [ x$LTTNG_TOOLS_TESTS_DISABLE_WARN_LTTNG_PROCESSES == x1 ]; then
-	exit
-fi
-
-color_warn='\E[1;33m'
-color_reset='\E[0m'
-color_bold='\E[1m'
-
-lttng_processes="$("$1" 'lttng|gen-ust-.+' -a | grep -v "$(basename "$0")")"
-
-if [ $? -eq 0 ]; then
-	pids="$(cut -d ' ' -f 1 <<< "$lttng_processes" | tr '\n' ' ')"
-
-	echo -e "${color_warn}Warning: the following LTTng processes were detected running on the system:$color_reset"
-	echo
-	echo "$lttng_processes"
-	echo
-	echo -e "Here's how to kill them: ${color_bold}kill -9 $pids$color_reset"
-	echo -e "${color_warn}If you leave them alive, some tests could fail.$color_reset"
-	echo
-fi
diff --git a/tests/utils/warn_processes.sh b/tests/utils/warn_processes.sh
new file mode 100755
index 000000000..fee1d0f58
--- /dev/null
+++ b/tests/utils/warn_processes.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+PGREP="$1"
+
+if [ x$LTTNG_TOOLS_TESTS_DISABLE_WARN_LTTNG_PROCESSES == x1 ]; then
+	exit
+fi
+
+color_warn='\E[1;33m'
+color_reset='\E[0m'
+color_bold='\E[1m'
+
+lttng_processes="$("$PGREP" -l 'lttng|gen-ust-.+')"
+
+if [ $? -eq 0 ]; then
+	pids="$(cut -d ' ' -f 1 <<< "$lttng_processes" | tr '\n' ' ')"
+
+	echo -e "${color_warn}Warning: the following LTTng processes were detected running on the system:$color_reset"
+	echo
+	echo "$lttng_processes"
+	echo
+	echo -e "Here's how to kill them: ${color_bold}kill -9 $pids$color_reset"
+	echo -e "${color_warn}If you leave them alive, some tests could fail.$color_reset"
+	echo
+fi