[lttng-tools,2/2] Tests: Make warn_processes.sh more portable
Commit Message
Options to pgrep aren't standardised across coreutils
implementations, use a more common option.
Signed-off-by: Michael Jeanson <mjeanson at efficios.com>
---
tests/Makefile.am | 2 +-
tests/utils/Makefile.am | 2 +-
tests/utils/warn_lttng_processes.sh | 23 -----------------------
tests/utils/warn_processes.sh | 25 +++++++++++++++++++++++++
4 files changed, 27 insertions(+), 25 deletions(-)
delete mode 100755 tests/utils/warn_lttng_processes.sh
create mode 100755 tests/utils/warn_processes.sh
@@ -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 "========================================="
@@ -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
deleted file mode 100755
@@ -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
new file mode 100755
@@ -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