Split in a number of subtest for easy maintenance and continued Mac support.
diff --git a/Lib/test/testall.py b/Lib/test/testall.py
index 5f4a9dc..5f17be1 100644
--- a/Lib/test/testall.py
+++ b/Lib/test/testall.py
@@ -1,514 +1,28 @@
-# Module 'testall'
-#
-# Python test set, should exercise:
-# - all lexical and grammatical constructs
-# - all opcodes from "opcode.h"
-# - all operations on all object types
-# - all builtin functions
-# Ideally also:
-# - all builtin modules
-# - all possible exception situations (Thank God we've got 'try')
-# - all boundary cases
+# testall.py -- a regression test for the Python interpreter.
+# To run the tests, execute "import testall" in a clean interpreter.
+# It is a good idea to do this whenever you build a new interpreter.
+# Remember to add new tests when new features are added!
+from test_support import *
-TestFailed = 'testall -- test failed' # Exception
+print 'test_grammar'
+forget('test_grammar')
+import test_grammar
+print 'test_opcodes'
+unload('test_opcodes')
+import test_opcodes
-#########################################################
-# Part 1. Test all lexical and grammatical constructs.
-# This just tests whether the parser accepts them all.
-#########################################################
+print 'test_operations'
+unload('test_operations')
+import test_operations
-print '1. Parser'
+print 'test_builtin'
+unload('test_builtin')
+import test_builtin
-print '1.1 Tokens'
-
-print '1.1.1 Backslashes'
-
-# Backslash means line continuation:
-x = 1 \
-+ 1
-if x <> 2: raise TestFailed, 'backslash for line continuation'
-
-# Backslash does not means continuation in comments :\
-x = 0
-if x <> 0: raise TestFailed, 'backslash ending comment'
-
-print '1.1.2 Number formats'
-
-if 0xff <> 255: raise TestFailed, 'hex number'
-if 0377 <> 255: raise TestFailed, 'octal number'
-x = 3.14
-x = 0.314
-x = .14
-x = 3.
-x = 3e14
-x = 3E14
-x = 3e-14
-x = 3.e14
-x = .14e3
-x = 0L
-x = 0l
-x = 0xffffffffffffffffL
-x = 0xffffffffffffffffl
-x = 077777777777777777L
-x = 077777777777777777l
-x = 123456789012345678901234567890L
-x = 123456789012345678901234567890l
-
-print '1.2 Grammar'
-
-print 'single_input' # NEWLINE | simple_stmt | compound_stmt NEWLINE
-# XXX can't test in a script -- this rule is only used when interactive
-
-print 'file_input' # (NEWLINE | stmt)* ENDMARKER
-# Being tested as this very moment this very module
-
-print 'expr_input' # testlist NEWLINE
-# XXX Hard to test -- used only in calls to input()
-
-print 'eval_input' # testlist ENDMARKER
-x = eval('1, 0 or 1')
-
-print 'funcdef' # 'def' NAME parameters ':' suite
-### parameters: '(' [fplist] ')'
-### fplist: fpdef (',' fpdef)*
-### fpdef: NAME | '(' fplist ')'
-def f1(): pass
-def f2(one_argument): pass
-def f3(two, arguments): pass
-def f4(two, (compound, (arguments))): pass
-
-### stmt: simple_stmt | compound_stmt
-# Tested below
-
-### simple_stmt: small_stmt (';' small_stmt)* [';']
-print 'simple_stmt'
-x = 1; pass; del x
-
-### small_stmt: expr_stmt | print_stmt | pass_stmt | del_stmt | flow_stmt | import_stmt
-# Tested below
-
-print 'expr_stmt' # (exprlist '=')* exprlist
-1
-1, 2, 3
-x = 1
-x = 1, 2, 3
-x = y = z = 1, 2, 3
-x, y, z = 1, 2, 3
-abc = a, b, c = x, y, z = xyz = 1, 2, (3, 4)
-# NB these variables are deleted below
-
-print 'print_stmt' # 'print' (test ',')* [test]
-print 1, 2, 3
-print 1, 2, 3,
-print
-print 0 or 1, 0 or 1,
-print 0 or 1
-
-print 'del_stmt' # 'del' exprlist
-del abc
-del x, y, (z, xyz)
-
-print 'pass_stmt' # 'pass'
-pass
-
-print 'flow_stmt' # break_stmt | continue_stmt | return_stmt | raise_stmt
-# Tested below
-
-print 'break_stmt' # 'break'
-while 1: break
-
-print 'continue_stmt' # 'continue'
-i = 1
-while i: i = 0; continue
-
-print 'return_stmt' # 'return' [testlist]
-def g1(): return
-def g2(): return 1
-g1()
-x = g2()
-
-print 'raise_stmt' # 'raise' test [',' test]
-try: raise RuntimeError, 'just testing'
-except RuntimeError: pass
-try: raise KeyboardInterrupt
-except KeyboardInterrupt: pass
-
-print 'import_stmt' # 'import' NAME (',' NAME)* | 'from' NAME 'import' ('*' | NAME (',' NAME)*)
-[1]
-import sys
-[2]
-import time, math
-[3]
-from time import sleep
-[4]
-from sys import *
-[5]
-from math import sin, cos
-[6]
-
-### compound_stmt: if_stmt | while_stmt | for_stmt | try_stmt | funcdef | classdef
-# Tested below
-
-print 'if_stmt' # 'if' test ':' suite ('elif' test ':' suite)* ['else' ':' suite]
-if 1: pass
-if 1: pass
-else: pass
-if 0: pass
-elif 0: pass
-if 0: pass
-elif 0: pass
-elif 0: pass
-elif 0: pass
-else: pass
-
-print 'while_stmt' # 'while' test ':' suite ['else' ':' suite]
-while 0: pass
-while 0: pass
-else: pass
-
-print 'for_stmt' # 'for' exprlist 'in' exprlist ':' suite ['else' ':' suite]
-[1]
-for i in 1, 2, 3: pass
-[2]
-for i, j, k in (): pass
-else: pass
-[3]
-
-print 'try_stmt' # 'try' ':' suite (except_clause ':' suite)* ['finally' ':' suite]
-### except_clause: 'except' [expr [',' expr]]
-try: pass
-try: 1/0
-except ZeroDivisionError: pass
-try: 1/0
-except EOFError: pass
-except TypeError, msg: pass
-except RuntimeError, msg: pass
-except ZeroDivisionError, msg: pass
-except: pass
-try: pass
-finally: pass
-try: 1/0
-except: pass
-finally: pass
-
-print 'suite' # simple_stmt | NEWLINE INDENT NEWLINE* (stmt NEWLINE*)+ DEDENT
-if 1: pass
-if 1:
- pass
-if 1:
- #
- #
- #
- pass
- pass
- #
- pass
- #
-
-print 'test' # and_test ('or' and_test)*
-### and_test: not_test ('and' not_test)*
-### not_test: 'not' not_test | comparison
-### comparison: expr (comp_op expr)*
-### comp_op: '<'|'>'|'='|'>' '='|'<' '='|'<' '>'|'in'|'not' 'in'|'is'|'is' 'not'
-if 1: pass
-if 1 == 1: pass
-if 1 < 1 > 1 == 1 >= 1 <= 1 <> 1 in 1 not in 1 is 1 is not 1: pass
-if not 1 == 1 == 1: pass
-if not 1 == 1 and 1 and 1: pass
-if 1 and 1 or 1 and 1 and 1 or not 1 == 1 == 1 and 1: pass
-
-print 'expr' # term (('+'|'-') term)*
-x = 1
-x = 1 + 1
-x = 1 - 1 - 1
-x = 1 - 1 + 1 - 1 + 1
-
-print 'term' # factor (('*'|'/'|'%') factor)*
-x = 1 * 1
-x = 1 / 1
-x = 1 % 1
-x = 1 / 1 * 1 % 1
-
-print 'factor' # ('+'|'-') factor | atom trailer*
-### trailer: '(' [testlist] ')' | '[' subscript ']' | '.' NAME
-### subscript: expr | [expr] ':' [expr]
-x = +1
-x = -1
-x = 1
-c = sys.path[0]
-x = time.time()
-x = sys.modules['time'].time()
-for a in '01234', (0,1,2,3,4), [0,1,2,3,4]:
- c = a[0]
- c = a[-1]
- c = a[0:5]
- c = a[:5]
- c = a[0:]
- c = a[:]
- c = a[-5:]
- c = a[:-1]
- c = a[-4:-3]
-a = [0,1,2,3,4]
-del a[0]
-a = [0,1,2,3,4]
-del a[-1]
-a = [0,1,2,3,4]
-del a[1:2]
-a = [0,1,2,3,4]
-del a[:1]
-a = [0,1,2,3,4]
-del a[-1:]
-a = [0,1,2,3,4]
-a[0] = 0
-a[-1] = 4
-a[1:2] = [1]
-a[1:4] = [0]
-a[1:-1] = [1,2,3]
-
-print 'atom' # '(' [tetslist] ')' | '[' [testlist] ']' | '{' '}' | '`' testlist '`' | NAME | NUMBER | STRING
-x = (1)
-x = (1 or 2 or 3)
-x = (1 or 2 or 3, 2, 3)
-x = []
-x = [1]
-x = [1 or 2 or 3]
-x = [1 or 2 or 3, 2, 3]
-x = []
-x = {}
-x = `x`
-x = x
-x = 'x'
-x = 123
-
-### exprlist: expr (',' expr)* [',']
-### testlist: test (',' test)* [',']
-# These have been exercised enough above
-
-print 'classdef' # 'class' NAME parameters ['=' baselist] ':' suite
-### baselist: atom arguments (',' atom arguments)*
-### arguments: '(' [testlist] ')'
-class B: pass
-class C1(B): pass
-class C2(B): pass
-class D(C1, C2, B): pass
-class C:
- def meth1(self): pass
- def meth2(self, arg): pass
- def meth3(self, (a1, a2)): pass
-
-
-#########################################################
-# Part 2. Test all opcodes from "opcode.h"
-#########################################################
-
-print '2. Opcodes'
-print 'XXX Not yet fully implemented'
-
-print '2.1 try inside for loop'
-n = 0
-for i in range(10):
- n = n+i
- try: 1/0
- except NameError: pass
- except RuntimeError: pass
- except ZeroDivisionError: pass
- except TypeError: pass
- finally: pass
- try: pass
- except: pass
- try: pass
- finally: pass
- n = n+i
-if n <> 90:
- raise TestFailed, 'try inside for'
-
-
-#########################################################
-# Part 3. Test all operations on all object types
-#########################################################
-
-print '3. Object types'
-print 'XXX Not yet implemented'
-
-
-#########################################################
-# Part 4. Test all built-in functions
-#########################################################
-
-print '4. Built-in functions'
-
-print 'abs'
-if abs(0) <> 0: raise TestFailed, 'abs(0)'
-if abs(1234) <> 1234: raise TestFailed, 'abs(1234)'
-if abs(-1234) <> 1234: raise TestFailed, 'abs(-1234)'
-#
-if abs(0.0) <> 0.0: raise TestFailed, 'abs(0.0)'
-if abs(3.14) <> 3.14: raise TestFailed, 'abs(3.14)'
-if abs(-3.14) <> 3.14: raise TestFailed, 'abs(-3.14)'
-#
-if abs(0L) <> 0L: raise TestFailed, 'abs(0L)'
-if abs(1234L) <> 1234L: raise TestFailed, 'abs(1234L)'
-if abs(-1234L) <> 1234L: raise TestFailed, 'abs(-1234L)'
-
-print 'chr'
-if chr(32) <> ' ': raise TestFailed, 'chr(32)'
-if chr(65) <> 'A': raise TestFailed, 'chr(65)'
-if chr(97) <> 'a': raise TestFailed, 'chr(97)'
-
-print 'dir'
-x = 1
-if 'x' not in dir(): raise TestFailed, 'dir()'
-import sys
-if 'modules' not in dir(sys): raise TestFailed, 'dir(sys)'
-
-print 'divmod'
-if divmod(12, 7) <> (1, 5): raise TestFailed, 'divmod(12, 7)'
-if divmod(-12, 7) <> (-2, 2): raise TestFailed, 'divmod(-12, 7)'
-if divmod(12, -7) <> (-2, -2): raise TestFailed, 'divmod(12, -7)'
-if divmod(-12, -7) <> (1, -5): raise TestFailed, 'divmod(-12, -7)'
-#
-if divmod(12L, 7L) <> (1L, 5L): raise TestFailed, 'divmod(12L, 7L)'
-if divmod(-12L, 7L) <> (-2L, 2L): raise TestFailed, 'divmod(-12L, 7L)'
-if divmod(12L, -7L) <> (-2L, -2L): raise TestFailed, 'divmod(12L, -7L)'
-if divmod(-12L, -7L) <> (1L, -5L): raise TestFailed, 'divmod(-12L, -7L)'
-#
-if divmod(12, 7L) <> (1, 5L): raise TestFailed, 'divmod(12, 7L)'
-if divmod(-12, 7L) <> (-2, 2L): raise TestFailed, 'divmod(-12, 7L)'
-if divmod(12L, -7) <> (-2L, -2): raise TestFailed, 'divmod(12L, -7)'
-if divmod(-12L, -7) <> (1L, -5): raise TestFailed, 'divmod(-12L, -7)'
-
-print 'eval'
-if eval('1+1') <> 2: raise TestFailed, 'eval(\'1+1\')'
-
-print 'exec'
-z = 0
-exec('z=1+1\n')
-if z <> 2: raise TestFailed, 'exec(\'z=1+1\'\\n)'
-
-print 'float'
-if float(3.14) <> 3.14: raise TestFailed, 'float(3.14)'
-if float(314) <> 314.0: raise TestFailed, 'float(314)'
-if float(314L) <> 314.0: raise TestFailed, 'float(314L)'
-
-print 'input'
-# Can't test in a script
-
-print 'int'
-if int(314) <> 314: raise TestFailed, 'int(314)'
-if int(3.14) <> 3: raise TestFailed, 'int(3.14)'
-if int(314L) <> 314: raise TestFailed, 'int(314L)'
-
-print 'len'
-if len('123') <> 3: raise TestFailed, 'len(\'123\')'
-if len(()) <> 0: raise TestFailed, 'len(())'
-if len((1, 2, 3, 4)) <> 4: raise TestFailed, 'len((1, 2, 3, 4))'
-if len([1, 2, 3, 4]) <> 4: raise TestFailed, 'len([1, 2, 3, 4])'
-if len({}) <> 0: raise TestFailed, 'len({})'
-
-print 'long'
-if long(314) <> 314L: raise TestFailed, 'long(314)'
-if long(3.14) <> 3L: raise TestFailed, 'long(3.14)'
-if long(314L) <> 314L: raise TestFailed, 'long(314L)'
-
-print 'min'
-if min('123123') <> '1': raise TestFailed, 'min(\'123123\')'
-if min(1, 2, 3) <> 1: raise TestFailed, 'min(1, 2, 3)'
-if min((1, 2, 3, 1, 2, 3)) <> 1: raise TestFailed, 'min((1, 2, 3, 1, 2, 3))'
-if min([1, 2, 3, 1, 2, 3]) <> 1: raise TestFailed, 'min([1, 2, 3, 1, 2, 3])'
-#
-if min(1, 2L, 3.0) <> 1: raise TestFailed, 'min(1, 2L, 3.0)'
-if min(1L, 2.0, 3) <> 1L: raise TestFailed, 'min(1L, 2.0, 3)'
-if min(1.0, 2, 3L) <> 1.0: raise TestFailed, 'min(1.0, 2, 3L)'
-
-print 'max'
-if max('123123') <> '3': raise TestFailed, 'max(\'123123\')'
-if max(1, 2, 3) <> 3: raise TestFailed, 'max(1, 2, 3)'
-if max((1, 2, 3, 1, 2, 3)) <> 3: raise TestFailed, 'max((1, 2, 3, 1, 2, 3))'
-if max([1, 2, 3, 1, 2, 3]) <> 3: raise TestFailed, 'max([1, 2, 3, 1, 2, 3])'
-#
-if max(1, 2L, 3.0) <> 3.0: raise TestFailed, 'max(1, 2L, 3.0)'
-if max(1L, 2.0, 3) <> 3: raise TestFailed, 'max(1L, 2.0, 3)'
-if max(1.0, 2, 3L) <> 3L: raise TestFailed, 'max(1.0, 2, 3L)'
-
-print 'open'
-print 'NB! This test creates a file named "@test" in the current directory.'
-fp = open('@test', 'w')
-fp.write('The quick brown fox jumps over the lazy dog')
-fp.write('.\n')
-fp.write('Dear John\n')
-fp.write('XXX'*100)
-fp.write('YYY'*100)
-fp.close()
-del fp
-fp = open('@test', 'r')
-if fp.readline() <> 'The quick brown fox jumps over the lazy dog.\n':
- raise TestFailed, 'readline()'
-if fp.readline(4) <> 'Dear': raise TestFailed, 'readline(4) # short'
-if fp.readline(100) <> ' John\n': raise TestFailed, 'readline(100)'
-if fp.read(300) <> 'XXX'*100: raise TestFailed, 'read(300)'
-if fp.read(1000) <> 'YYY'*100: raise TestFailed, 'read(1000) # truncate'
-fp.close()
-del fp
-
-print 'ord'
-if ord(' ') <> 32: raise TestFailed, 'ord(\' \')'
-if ord('A') <> 65: raise TestFailed, 'ord(\'A\')'
-if ord('a') <> 97: raise TestFailed, 'ord(\'a\')'
-
-print 'pow'
-if pow(0,0) <> 1: raise TestFailed, 'pow(0,0)'
-if pow(0,1) <> 0: raise TestFailed, 'pow(0,1)'
-if pow(1,0) <> 1: raise TestFailed, 'pow(1,0)'
-if pow(1,1) <> 1: raise TestFailed, 'pow(1,1)'
-#
-if pow(2,0) <> 1: raise TestFailed, 'pow(2,0)'
-if pow(2,10) <> 1024: raise TestFailed, 'pow(2,10)'
-if pow(2,20) <> 1024*1024: raise TestFailed, 'pow(2,20)'
-if pow(2,30) <> 1024*1024*1024: raise TestFailed, 'pow(2,30)'
-#
-if pow(-2,0) <> 1: raise TestFailed, 'pow(-2,0)'
-if pow(-2,1) <> -2: raise TestFailed, 'pow(-2,1)'
-if pow(-2,2) <> 4: raise TestFailed, 'pow(-2,2)'
-if pow(-2,3) <> -8: raise TestFailed, 'pow(-2,3)'
-
-print 'range'
-if range(3) <> [0, 1, 2]: raise TestFailed, 'range(3)'
-if range(1, 5) <> [1, 2, 3, 4]: raise TestFailed, 'range(1, 5)'
-if range(0) <> []: raise TestFailed, 'range(0)'
-if range(-3) <> []: raise TestFailed, 'range(-3)'
-if range(1, 10, 3) <> [1, 4, 7]: raise TestFailed, 'range(1, 10, 3)'
-if range(5, -5, -3) <> [5, 2, -1, -4]: raise TestFailed, 'range(5, -5, -3)'
-
-print 'raw_input'
-savestdin = sys.stdin
-try:
- sys.stdin = open('@test', 'r')
- if raw_input() <> 'The quick brown fox jumps over the lazy dog.':
- raise TestFailed, 'raw_input()'
- if raw_input('testing\n') <> 'Dear John':
- raise TestFailed, 'raw_input(\'testing\\n\')'
-finally:
- sys.stdin = savestdin
-
-print 'reload'
-import string
-reload(string)
-
-print 'type'
-if type('') <> type('123') or type('') == type(()):
- raise TestFailed, 'type()'
-
+print 'test_exceptions'
+unload('test_exceptions')
+import test_exceptions
print 'Passed all tests.'
-
-try:
- import mac
- unlink = mac.unlink
-except ImportError:
- import posix
- unlink = posix.unlink
-
-unlink('@test')
-print 'Unlinked @test'