From 54b36bc2d17336b3a29a9ba459fca3adceb00632 Mon Sep 17 00:00:00 2001 From: rocky Date: Wed, 13 Dec 2017 08:55:55 -0500 Subject: [PATCH] Update stdlib/runtest.sh code and failures --- test/stdlib/runtests.sh | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/test/stdlib/runtests.sh b/test/stdlib/runtests.sh index 63f3afd0..994df916 100755 --- a/test/stdlib/runtests.sh +++ b/test/stdlib/runtests.sh @@ -51,7 +51,6 @@ case $PYVERSION in 2.6) SKIP_TESTS=( [test_binop.py]=1 # need to fix tryelse - # [test_builtin.py]=1 # Syntax error on 2.6, look at and fix like 2.7.14 [test_cmath.py]=1 # Control flow? [test_codecs.py]=1 # need to fix tryelse [test_coercion.py]=1 # Control flow? @@ -64,8 +63,15 @@ case $PYVERSION in [test_ftplib.py]=1 # Control flow? [test_funcattrs.py]=1 # Control flow? [test_grp.py]=1 # Long test - might work Control flow? + [test_imp.py]=1 + [test_int.py]=1 + [test_long.py]=1 + [test_pty.py]=1 [test_pwd.py]=1 # Long test - might work? Control flow? [test_queue.py]=1 # Control flow? + [test_re.py]=1 # Probably Control flow? + [test_strftime.py]=1 + [test_trace.py]=1 # Line numbers are expected to be different # .pyenv/versions/2.6.9/lib/python2.6/lib2to3/refactor.pyc # .pyenv/versions/2.6.9/lib/python2.6/mailbox.pyc # .pyenv/versions/2.6.9/lib/python2.6/markupbase.pyc @@ -83,8 +89,17 @@ case $PYVERSION in SKIP_TESTS=( [test_dis.py]=1 # We change line numbers - duh! [test_grammar.py]=1 # Too many stmts. Handle large stmts + [test_io.py]=1 # Test takes too long to run [test_ioctl.py]=1 # Test takes too long to run [test_itertools.py]=1 # Syntax error - look at! + [test_memoryio.py]=1 # ? + [test_multiprocessing.py]=1 # ? + [test_pep352.py]=1 # ? + [test_re.py]=1 # ? + [test_sys_settrace.py]=1 # Line numbers are expected to be different + [test_strtod.py]=1 + [test_traceback.py]=1 + [test_unicode.py]=1 # Syntax errors: # .pyenv/versions/2.7.14/lib/python2.7/mimify.pyc # .pyenv/versions/2.7.14/lib/python2.7/netrc.pyc @@ -119,13 +134,22 @@ if [[ -n $1 ]] ; then files=$1 SKIP_TESTS=() else - files=test_[m]*.py + files=test_*.py fi for file in $files; do [[ -v SKIP_TESTS[$file] ]] && continue # If the fails *before* decompiling, skip it! + typeset -i STARTTIME=$(date +%s) if ! python $file >/dev/null 2>&1 ; then + echo "Skipping test $file -- it fails on its own" + continue + fi + typeset -i ENDTIME=$(date +%s) + typeset -i time_diff + (( time_diff = ENDTIME - STARTTIME)) + if (( time_diff > 10 )) ; then + echo "Skipping test $file -- test takes too long to run: $time_diff seconds" continue fi @@ -135,10 +159,11 @@ for file in $files; do decompiled_file=$short_name-${PYVERSION}.pyc $fulldir/compile-file.py $file && \ mv $file{,.orig} && \ + echo ========== $(date +%X) Decompiling $file =========== $fulldir/../../bin/uncompyle6 $decompiled_file > $file rc=$? if (( rc == 0 )) ; then - echo ========== Running $file =========== + echo ========== $(date +%X) Running $file =========== python $file rc=$? else