From 84e9b75e789b019a7ecd1c3e7f2cfed585e86d1f Mon Sep 17 00:00:00 2001 From: rocky Date: Tue, 14 Jan 2020 18:51:40 -0500 Subject: [PATCH] Attempt to fix runtests.sh again --- test/stdlib/3.7-exclude.sh | 1 + test/stdlib/runtests.sh | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/test/stdlib/3.7-exclude.sh b/test/stdlib/3.7-exclude.sh index b11c206b..7ba2c3b1 100644 --- a/test/stdlib/3.7-exclude.sh +++ b/test/stdlib/3.7-exclude.sh @@ -33,6 +33,7 @@ SKIP_TESTS=( [test_devpoll.py]=1 # it fails on its own [test_dictcomps.py]=1 # Bad semantics - Investigate [test_dis.py]=1 # We change line numbers - duh! + [test_doctest2.py]=1 # assert failure [test_docxmlrpc.py]=1 [test_exceptions.py]=1 # parse error [test_enumerate.py]=1 # diff --git a/test/stdlib/runtests.sh b/test/stdlib/runtests.sh index c590497e..c4ee1611 100755 --- a/test/stdlib/runtests.sh +++ b/test/stdlib/runtests.sh @@ -268,11 +268,6 @@ srcdir=$(dirname $me) cd $srcdir fulldir=$(pwd) -# pyenv version cleaning -for dir in .. ; do - (cd $dir && [[ -r .python-version ]] && rm -v .python-version ) -done - # DECOMPILER=uncompyle2 DECOMPILER=${DECOMPILER:-"$fulldir/../../bin/uncompyle6"} TESTDIR=/tmp/test${PYVERSION} @@ -282,6 +277,13 @@ fi PYENV_ROOT=${PYENV_ROOT:-$HOME/.pyenv} pyenv_local=$(pyenv local) + +# pyenv version cleaning +for dir in ../ ../../ ; do + cp -v .python-version $dir +done + + mkdir $TESTDIR || exit $? cp -r ${PYENV_ROOT}/versions/${PYVERSION}.${MINOR}/lib/python${PYVERSION}/test $TESTDIR cd $TESTDIR/test