[pypy-svn] r75087 - in pypy/branch/fast-forward: lib-python pypy/tool pypy/tool/pytest/run-script
benjamin at codespeak.net
benjamin at codespeak.net
Fri Jun 4 00:49:09 CEST 2010
Author: benjamin
Date: Fri Jun 4 00:49:07 2010
New Revision: 75087
Modified:
pypy/branch/fast-forward/lib-python/conftest.py
pypy/branch/fast-forward/pypy/tool/alarm.py
pypy/branch/fast-forward/pypy/tool/pytest/run-script/regrverbose.py
Log:
revert random changes
Modified: pypy/branch/fast-forward/lib-python/conftest.py
==============================================================================
--- pypy/branch/fast-forward/lib-python/conftest.py (original)
+++ pypy/branch/fast-forward/lib-python/conftest.py Fri Jun 4 00:49:07 2010
@@ -127,19 +127,13 @@
RegrTest('test___all__.py', core=True),
RegrTest('test___future__.py', core=True),
RegrTest('test__locale.py', skip=skip_win32),
- RegrTest('test_abc.py'),
- RegrTest('test_abstract_numbers.py'),
RegrTest('test_aepack.py', skip=True),
- RegrTest('test_aifc.py'),
- RegrTest('test_argparse.py'),
RegrTest('test_al.py', skip=True),
RegrTest('test_ast.py', core=True),
RegrTest('test_anydbm.py'),
RegrTest('test_applesingle.py', skip=True),
RegrTest('test_array.py', core=True, usemodules='struct'),
- RegrTest('test_ascii_formatd.py'),
RegrTest('test_asynchat.py', usemodules='thread'),
- RegrTest('test_asyncore.py'),
RegrTest('test_atexit.py', core=True),
RegrTest('test_audioop.py', skip=True),
RegrTest('test_augassign.py', core=True),
@@ -155,10 +149,8 @@
RegrTest('test_bsddb.py', skip="unsupported extension module"),
RegrTest('test_bsddb185.py', skip="unsupported extension module"),
RegrTest('test_bsddb3.py', skip="unsupported extension module"),
- RegrTest('test_buffer.py'),
RegrTest('test_bufio.py', core=True),
RegrTest('test_builtin.py', core=True),
- RegrTest('test_bytes.py'),
RegrTest('test_bz2.py', usemodules='bz2'),
RegrTest('test_calendar.py'),
RegrTest('test_call.py', core=True),
@@ -171,8 +163,6 @@
RegrTest('test_cl.py', skip=True),
RegrTest('test_class.py', core=True),
RegrTest('test_cmath.py', core=True),
- RegrTest('test_cmd.py'),
- RegrTest('test_cmd_line_script.py'),
RegrTest('test_codeccallbacks.py', core=True),
RegrTest('test_codecencodings_cn.py', skip="encodings not available"),
RegrTest('test_codecencodings_hk.py', skip="encodings not available"),
@@ -188,12 +178,11 @@
RegrTest('test_codecs.py', core=True),
RegrTest('test_codeop.py', core=True),
RegrTest('test_coercion.py', core=True),
- RegrTest('test_collections.py'),
+
RegrTest('test_colorsys.py'),
RegrTest('test_commands.py'),
RegrTest('test_compare.py', core=True),
RegrTest('test_compile.py', core=True),
- RegrTest('test_compileall.py'),
RegrTest('test_compiler.py', core=False, skip="slowly deprecating compiler"),
RegrTest('test_complex.py', core=True),
@@ -203,7 +192,6 @@
RegrTest('test_copy.py', core=True),
RegrTest('test_copy_reg.py', core=True),
RegrTest('test_cpickle.py', core=True),
- RegrTest('test_cprofile.py'),
RegrTest('test_crypt.py', usemodules='crypt', skip=skip_win32),
RegrTest('test_csv.py'),
@@ -216,8 +204,7 @@
RegrTest('test_descr.py', core=True, usemodules='_weakref'),
RegrTest('test_descrtut.py', core=True),
RegrTest('test_dict.py', core=True),
- RegrTest('test_dictcomps.py', core=True),
- RegrTest('test_dictviews.py', core=True),
+
RegrTest('test_difflib.py'),
RegrTest('test_dircache.py', core=True),
RegrTest('test_dis.py'),
@@ -225,7 +212,6 @@
RegrTest('test_dl.py', skip=True),
RegrTest('test_doctest.py', usemodules="thread"),
RegrTest('test_doctest2.py'),
- RegrTest('test_docxmlrpc.py'),
RegrTest('test_dumbdbm.py'),
RegrTest('test_dummy_thread.py', core=True),
RegrTest('test_dummy_threading.py', core=True),
@@ -234,36 +220,27 @@
RegrTest('test_email_codecs.py'),
RegrTest('test_enumerate.py', core=True),
RegrTest('test_eof.py', core=True),
- RegrTest('test_epoll.py'),
+
RegrTest('test_errno.py'),
RegrTest('test_exceptions.py', core=True),
RegrTest('test_extcall.py', core=True),
RegrTest('test_fcntl.py', usemodules='fcntl', skip=skip_win32),
RegrTest('test_file.py', usemodules="posix", core=True),
- RegrTest('test_file2k.py', usemodules="posix", core=True),
RegrTest('test_filecmp.py', core=True),
RegrTest('test_fileinput.py', core=True),
- RegrTest('test_fileio.py'),
RegrTest('test_fnmatch.py', core=True),
RegrTest('test_fork1.py', usemodules="thread"),
RegrTest('test_format.py', core=True),
RegrTest('test_fpformat.py', core=True),
- RegrTest('test_fractions.py'),
RegrTest('test_frozen.py', skip="unsupported extension module"),
- RegrTest('test_ftplib.py'),
RegrTest('test_funcattrs.py', core=True),
RegrTest('test_future.py', core=True),
RegrTest('test_future1.py', core=True),
RegrTest('test_future2.py', core=True),
RegrTest('test_future3.py', core=True),
- RegrTest('test_future4.py', core=True),
- RegrTest('test_future5.py', core=True),
- RegrTest('test_future_builtins.py'),
RegrTest('test_gc.py', usemodules='_weakref', skip="implementation detail"),
- RegrTest('test_gdb.py', skip="not applicable"),
RegrTest('test_gdbm.py', skip="unsupported extension module"),
RegrTest('test_generators.py', core=True, usemodules='thread _weakref'),
- RegrTest('test_genericpath.py'),
RegrTest('test_genexps.py', core=True, usemodules='_weakref'),
RegrTest('test_getargs.py', skip="unsupported extension module"),
RegrTest('test_getargs2.py', skip="unsupported extension module"),
@@ -288,28 +265,20 @@
RegrTest('test_htmllib.py'),
RegrTest('test_htmlparser.py'),
RegrTest('test_httplib.py'),
- RegrTest('test_httpservers.py'),
RegrTest('test_imageop.py', skip="unsupported extension module"),
RegrTest('test_imaplib.py'),
RegrTest('test_imgfile.py', skip="unsupported extension module"),
RegrTest('test_imp.py', core=True, usemodules='thread'),
RegrTest('test_import.py', core=True),
RegrTest('test_importhooks.py', core=True),
- RegrTest('test_importlib.py'),
RegrTest('test_inspect.py'),
- RegrTest('test_int.py'),
- RegrTest('test_int_literal.py'),
- RegrTest('test_io.py'),
RegrTest('test_ioctl.py'),
RegrTest('test_isinstance.py', core=True),
RegrTest('test_iter.py', core=True),
RegrTest('test_iterlen.py', skip="undocumented internal API behavior __length_hint__"),
RegrTest('test_itertools.py', core=True),
- RegrTest('test_json.py'),
- RegrTest('test_kqueue.py'),
+
RegrTest('test_largefile.py'),
- RegrTest('test_lib2to3.py'),
- RegrTest('test_linecache.py'),
RegrTest('test_linuxaudiodev.py', skip="unsupported extension module"),
RegrTest('test_list.py', core=True),
RegrTest('test_locale.py', usemodules="_locale"),
@@ -317,14 +286,11 @@
RegrTest('test_long.py', core=True),
RegrTest('test_long_future.py', core=True),
RegrTest('test_longexp.py', core=True),
- RegrTest('test_macos.py'),
RegrTest('test_macostools.py', skip=True),
RegrTest('test_macpath.py'),
RegrTest('test_mailbox.py'),
RegrTest('test_marshal.py', core=True),
RegrTest('test_math.py', core=True, usemodules='math'),
- RegrTest('test_memoryio.py'),
- RegrTest('test_memoryview.py'),
RegrTest('test_md5.py'),
RegrTest('test_mhlib.py'),
RegrTest('test_mimetools.py'),
@@ -333,13 +299,10 @@
RegrTest('test_minidom.py'),
RegrTest('test_mmap.py'),
RegrTest('test_module.py', core=True),
- RegrTest('test_modulefinder.py'),
RegrTest('test_multibytecodec.py', skip="unsupported codecs"),
RegrTest('test_multibytecodec_support.py', skip="not a test"),
RegrTest('test_multifile.py'),
- RegrTest('test_multiprocessing.py'),
RegrTest('test_mutants.py', core="possibly"),
- RegrTest('test_mutex.py'),
RegrTest('test_netrc.py'),
RegrTest('test_new.py', core=True),
RegrTest('test_nis.py', skip="unsupported extension module"),
@@ -353,7 +316,7 @@
RegrTest('test_os.py', core=True),
RegrTest('test_ossaudiodev.py', skip="unsupported extension module"),
RegrTest('test_parser.py', skip="slowly deprecating compiler"),
- RegrTest('test_pdb.py'),
+
RegrTest('test_peepholer.py'),
RegrTest('test_pep247.py'),
RegrTest('test_pep263.py'),
@@ -361,35 +324,28 @@
RegrTest('test_pep292.py'),
RegrTest('test_pickle.py', core=True),
RegrTest('test_pickletools.py', core=False),
- RegrTest('test_pipes.py'),
RegrTest('test_pkg.py', core=True),
RegrTest('test_pkgimport.py', core=True),
- RegrTest('test_pkgutil.py'),
RegrTest('test_plistlib.py', skip="unsupported module"),
RegrTest('test_poll.py', skip=skip_win32),
RegrTest('test_popen.py'),
RegrTest('test_popen2.py'),
- RegrTest('test_poplib.py'),
RegrTest('test_posix.py'),
RegrTest('test_posixpath.py'),
RegrTest('test_pow.py', core=True),
RegrTest('test_pprint.py', core=True),
- RegrTest('test_print.py', core=True),
RegrTest('test_profile.py'),
RegrTest('test_profilehooks.py', core=True),
- RegrTest('test_property.py', core=True),
- RegrTest('test_pstats.py'),
RegrTest('test_pty.py', skip="unsupported extension module"),
RegrTest('test_pwd.py', skip=skip_win32),
- RegrTest('test_py3kwarn.py'),
+
RegrTest('test_pyclbr.py'),
- RegrTest('test_pydoc.py'),
RegrTest('test_pyexpat.py'),
RegrTest('test_queue.py', usemodules='thread'),
RegrTest('test_quopri.py'),
RegrTest('test_random.py'),
RegrTest('test_re.py', core=True),
- RegrTest('test_readline.py'),
+
RegrTest('test_repr.py', core=True),
RegrTest('test_resource.py', skip=skip_win32),
RegrTest('test_rfc822.py'),
@@ -402,25 +358,20 @@
RegrTest('test_select.py'),
RegrTest('test_set.py', core=True),
RegrTest('test_sets.py'),
- RegrTest('test_setcomps.py', core=True),
RegrTest('test_sgmllib.py'),
RegrTest('test_sha.py'),
RegrTest('test_shelve.py'),
RegrTest('test_shlex.py'),
RegrTest('test_shutil.py'),
RegrTest('test_signal.py'),
- RegrTest('test_SimpleHTTPServer.py'),
RegrTest('test_site.py', core=False),
RegrTest('test_slice.py', core=True),
- RegrTest('test_smtplib.py'),
- RegrTest('test_smtpnet.py'),
RegrTest('test_socket.py', usemodules='thread _weakref'),
RegrTest('test_socketserver.py', usemodules='thread'),
RegrTest('test_softspace.py', core=True),
RegrTest('test_sort.py', core=True),
- RegrTest('test_ssl.py'),
RegrTest('test_str.py', core=True),
RegrTest('test_strftime.py'),
@@ -430,7 +381,7 @@
RegrTest('test_strop.py', skip="deprecated"),
RegrTest('test_strptime.py'),
- RegrTest('test_strtod.py'),
+
RegrTest('test_struct.py', usemodules='struct'),
RegrTest('test_structmembers.py', skip="CPython specific"),
RegrTest('test_structseq.py'),
@@ -440,10 +391,9 @@
RegrTest('test_symtable.py', skip="implementation detail"),
RegrTest('test_syntax.py', core=True),
RegrTest('test_sys.py', core=True),
- RegrTest('test_sysconfig.py'),
RegrTest('test_tcl.py', skip="unsupported extension module"),
RegrTest('test_tarfile.py'),
- RegrTest('test_telnetlib.py'),
+
RegrTest('test_tempfile.py'),
RegrTest('test_textwrap.py'),
@@ -458,25 +408,22 @@
RegrTest('test_time.py', core=True),
RegrTest('test_timeout.py'),
- RegrTest('test_tk.py'),
- RegrTest('test_ttk_guionly.py'),
- RegrTest('test_ttk_textonly.py'),
+
RegrTest('test_tokenize.py'),
RegrTest('test_trace.py', core=True),
RegrTest('test_traceback.py', core=True),
RegrTest('test_transformer.py', core=True),
RegrTest('test_tuple.py', core=True),
- RegrTest('test_typechecks.py'),
+
RegrTest('test_types.py', core=True),
+
RegrTest('test_ucn.py'),
RegrTest('test_unary.py', core=True),
- RegrTest('test_undocumented_details.py'),
RegrTest('test_unicode.py', core=True),
RegrTest('test_unicode_file.py'),
RegrTest('test_unicodedata.py'),
RegrTest('test_unittest.py', core=True),
- RegrTest('test_univnewlines.py'),
- RegrTest('test_univnewlines2k.py', core=True),
+ RegrTest('test_univnewlines.py', core=True),
RegrTest('test_unpack.py', core=True),
RegrTest('test_urllib.py'),
RegrTest('test_urllib2.py'),
@@ -491,7 +438,6 @@
RegrTest('test_warnings.py', core=True),
RegrTest('test_wave.py', skip="unsupported extension module"),
RegrTest('test_weakref.py', core=True, usemodules='_weakref'),
- RegrTest('test_weakset.py'),
RegrTest('test_whichdb.py'),
RegrTest('test_winreg.py', skip=only_win32),
@@ -503,7 +449,6 @@
RegrTest('test_xrange.py', core=True),
RegrTest('test_zipfile.py'),
RegrTest('test_zipimport.py', usemodules='zlib zipimport'),
- RegrTest('test_zipimport_support.py', usemodules='zlib zipimport'),
RegrTest('test_zlib.py', usemodules='zlib'),
RegrTest('test_bigaddrspace.py'),
@@ -664,6 +609,7 @@
pypy_options.extend(
['--withmod-%s' % mod for mod in regrtest.usemodules])
sopt = " ".join(pypy_options)
+
cmd = "%s %s %d %s %s %s %s %s" %(
python, alarm_script, TIMEOUT,
pypy_script, sopt,
Modified: pypy/branch/fast-forward/pypy/tool/alarm.py
==============================================================================
--- pypy/branch/fast-forward/pypy/tool/alarm.py (original)
+++ pypy/branch/fast-forward/pypy/tool/alarm.py Fri Jun 4 00:49:07 2010
@@ -14,6 +14,7 @@
import time
import thread
+
def timeout_thread(timeout, finished):
stderr = sys.stderr
interrupt_main = thread.interrupt_main
Modified: pypy/branch/fast-forward/pypy/tool/pytest/run-script/regrverbose.py
==============================================================================
--- pypy/branch/fast-forward/pypy/tool/pytest/run-script/regrverbose.py (original)
+++ pypy/branch/fast-forward/pypy/tool/pytest/run-script/regrverbose.py Fri Jun 4 00:49:07 2010
@@ -4,7 +4,7 @@
test_support.verbose = int(sys.argv[1])
sys.argv[:] = sys.argv[2:]
-modname = sys.argv[0]
+modname = sys.argv[0]
impname = 'test.' + modname
try:
mod = __import__(impname, globals(), locals(), [modname])
More information about the Pypy-commit
mailing list