Use dash hack for PyPy+IPython

Fixes #1051
Closes #919 (I hope so)

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
-fi
 exit $FAILED

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