Ticket #9316: scripts9316_timeout_rebased.patch

File scripts9316_timeout_rebased.patch, 2.1 KB (added by wjp, 12 years ago)

rebased after #8641 and #9243

  • sage-doctest

    # HG changeset patch
    # User Willem Jan Palenstijn <wpalenst@math.leidenuniv.nl>
    # Date 1278449893 -7200
    # Node ID ba84c5fa2b62fa831f9b5b06ab9516a0594e409d
    # Parent  18a3dba7fb7b857ed6488101ce093576c2cbf789
    #9316: Add exit code 64 for time out to doctests
    
    diff -r 18a3dba7fb7b -r ba84c5fa2b62 sage-doctest
    a b  
    1919# 8: the doctesting framework raised an exception
    2020# 16: script called with bad options
    2121# 32: (used internally in sage-ptest)
     22# 64: time out
    2223# 128: failed doctests
    2324####################################################################
    2425
     
    679680            sys.exit(2)
    680681
    681682        if time.time() - tm >= TIMEOUT:
    682             err += "*** *** Error: TIMED OUT! *** ***"
    683683            print err
     684            sys.exit(64)
    684685
    685686        s, numfail = post_process(out, file, f)
    686687        s += err
  • sage-ptest

    diff -r 18a3dba7fb7b -r ba84c5fa2b62 sage-ptest
    a b  
    140140            numfail = ol.count('Expected:') + ol.count('Expected nothing') + ol.count('Exception raised:')
    141141            failed.append(abs(F)+(" # %s doctests failed" % numfail))
    142142            ret = numfail
     143        elif ret == 64:
     144            failed.append(abs(F)+" # Time out")
    143145        elif ret == 8:
    144146            failed.append(abs(F)+" # Exception from doctest framework")
    145147        elif ret == 4:
  • sage-test

    diff -r 18a3dba7fb7b -r ba84c5fa2b62 sage-test
    a b  
    9494        failed.append(sage_test_command(F)+" # Killed/crashed")
    9595    elif err == 8: # process exit code 8: Unhandled doctest exception
    9696        failed.append(sage_test_command(F)+" # Exception from doctest framework")
     97    elif err == 64: # process exit code 64: Time out
     98        failed.append(sage_test_command(F)+" # Time out")
    9799    elif err == 128: # process exit code 128: Regular doctest failures
    98100        failed.append(sage_test_command(F))
    99101    elif err != 0: