From d5361337c1623643e82c5a3d2538ee643a58e507 Mon Sep 17 00:00:00 2001 From: ZyX Date: Sat, 21 Feb 2015 16:08:50 +0300 Subject: [PATCH] Use script to test whether python zsh uses matches $PYTHON --- tests/test_shells/test.sh | 2 +- tests/test_shells/zsh_test_script.zsh | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 tests/test_shells/zsh_test_script.zsh diff --git a/tests/test_shells/test.sh b/tests/test_shells/test.sh index f5d208a8..5e346806 100755 --- a/tests/test_shells/test.sh +++ b/tests/test_shells/test.sh @@ -421,7 +421,7 @@ fi if ( test "x${ONLY_SHELL}" = "x" || test "x${ONLY_SHELL}" = "xzsh" ) \ && ( test "x${ONLY_TEST_TYPE}" = "x" || test "x${ONLY_TEST_TYPE}" = "xzpython" ) \ - && zsh -f -c 'zmodload libzpython' 2>/dev/null; then + && zsh tests/test_shells/zsh_test_script.zsh 2>/dev/null; then echo "> zpython" if ! run_test zpython zpython zsh -f -i ; then FAILED=1 diff --git a/tests/test_shells/zsh_test_script.zsh b/tests/test_shells/zsh_test_script.zsh new file mode 100644 index 00000000..f4b894ce --- /dev/null +++ b/tests/test_shells/zsh_test_script.zsh @@ -0,0 +1,9 @@ +set -e +. tests/bot-ci/scripts/common/main.sh +zmodload zpython +zpython 'import platform' +zpython 'zsh.setvalue("ZSH_PYTHON_VERSION", platform.python_version())' +zpython 'zsh.setvalue("ZSH_PYTHON_IMPLEMENTATION", platform.python_implementation())' + +[[ $ZSH_PYTHON_IMPLEMENTATION = $PYTHON_IMPLEMENTATION ]] +[[ $ZSH_PYTHON_VERSION = $PYTHON_VERSION ]]