From 54672aace05fe15351c50b1ca807be60032aae40 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 24 Aug 2014 16:59:03 +0400
Subject: [PATCH] Make COMMAND_PATTERN consistent with other arguments

---
 tests/test_shells/input.fish |  1 +
 tests/test_shells/test.sh    | 12 +++++-------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/tests/test_shells/input.fish b/tests/test_shells/input.fish
index 84685a77..673b720c 100644
--- a/tests/test_shells/input.fish
+++ b/tests/test_shells/input.fish
@@ -25,3 +25,4 @@ cd ../'$(echo)'
 cd ../'`echo`'
 false
 true is the last line
+exit
diff --git a/tests/test_shells/test.sh b/tests/test_shells/test.sh
index 9104fa99..052797e0 100755
--- a/tests/test_shells/test.sh
+++ b/tests/test_shells/test.sh
@@ -7,9 +7,9 @@ if test "x$1" = "x--fast" ; then
 fi
 ONLY_SHELL="$1"
 ONLY_TEST_TYPE="$2"
-COMMAND_PATTERN="$3"
+ONLY_TEST_CLIENT="$3"
 
-if ! test -z "$ONLY_SHELL$ONLY_TEST_TYPE$COMMAND_PATTERN" ; then
+if ! test -z "$ONLY_SHELL$ONLY_TEST_TYPE$ONLY_TEST_CLIENT" ; then
 	FAST=
 fi
 
@@ -18,11 +18,11 @@ export PYTHON
 if test "x$ONLY_SHELL" = "x--help" ; then
 cat << EOF
 Usage:
-	$0 [[[ONLY_SHELL | ""] (ONLY_TEST_TYPE | "")] (COMMAND_PATTERN | "")]
+	$0 [[[ONLY_SHELL | ""] (ONLY_TEST_TYPE | "")] (ONLY_TEST_CLIENT | "")]
 
 ONLY_SHELL: execute only tests for given shell
 ONLY_TEST_TYPE: execute only "daemon" or "nodaemon" tests
-COMMAND_PATTERN: use only commands that match given pattern for testing
+ONLY_TEST_CLIENT: use only given test client (one of C, python, render, shell)
 EOF
 exit 0
 fi
@@ -276,9 +276,7 @@ if test -z "${ONLY_SHELL}" || test "x${ONLY_SHELL%sh}" != "x${ONLY_SHELL}" || te
 			if test "$TEST_CLIENT" = "shell" && ! which socat >/dev/null ; then
 				continue
 			fi
-			if test "x$COMMAND_PATTERN" != "x" && ! (
-				echo "$POWERLINE_COMMAND" | grep -e"$COMMAND_PATTERN" &>/dev/null)
-			then
+			if test "x$ONLY_TEST_CLIENT" != "x" && test "x$TEST_CLIENT" != "x$ONLY_TEST_CLIENT" ; then
 				continue
 			fi
 			POWERLINE_COMMAND="$POWERLINE_COMMAND --socket $ADDRESS"