From 3f0d5385845fea8ae9e913e7d2c07e44c0b0da64 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sat, 29 Nov 2014 21:40:06 +0300
Subject: [PATCH] Use dash hack for PyPy+IPython

Fixes #1051
Closes #919 (I hope so)
---
 tests/run_shell_tests.sh  | 4 +---
 tests/test_shells/test.sh | 8 +++++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/tests/run_shell_tests.sh b/tests/run_shell_tests.sh
index 08655312..4fce28f5 100755
--- a/tests/run_shell_tests.sh
+++ b/tests/run_shell_tests.sh
@@ -2,8 +2,6 @@
 FAILED=0
 if ! sh tests/test_shells/test.sh --fast ; then
 	echo "Failed shells"
-	if ${PYTHON} -c 'import platform, sys; sys.exit(1 * (platform.python_implementation() == "PyPy"))' ; then
-		FAILED=1
-	fi
+	FAILED=1
 fi
 exit $FAILED
diff --git a/tests/test_shells/test.sh b/tests/test_shells/test.sh
index 8d68a06d..db95f1bf 100755
--- a/tests/test_shells/test.sh
+++ b/tests/test_shells/test.sh
@@ -102,7 +102,13 @@ run_test() {
 	while ! screen -S "$SESNAME" -p 0 -X width 300 1 ; do
 		sleep 0.1s
 	done
-	if test "x${SH}" = "xdash" ; then
+	if ( \
+		test "x${SH}" = "xdash" ||
+		( \
+			test "x${SH}" = "xipython" \
+			&& ${PYTHON} -c 'import platform, sys; sys.exit(1 - (platform.python_implementation() == "PyPy"))' \
+		) \
+	) ; then
 		# If I do not use this hack for dash then output will look like
 		#
 		#     command1