Author: Maciej Fijalkowski <fij...@gmail.com>
Branch:
Changeset: r59744:c62951b8a169
Date: 2013-01-05 19:47 +0200
http://bitbucket.org/pypy/pypy/changeset/c62951b8a169/
Log: merge
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -28,5 +28,7 @@
.. branch: remove-PYPY_NOT_MAIN_FILE
+.. branch: missing-jit-operations
+
.. branch: fix-lookinside-iff-oopspec
Fixed the interaction between two internal tools for controlling the JIT.
diff --git a/pypy/tool/release/test/test_make_release.py
b/pypy/tool/release/test/test_make_release.py
deleted file mode 100644
--- a/pypy/tool/release/test/test_make_release.py
+++ /dev/null
@@ -1,11 +0,0 @@
-
-import py
-from pypy.tool.release.make_release import browse_nightly
-
-XML = py.path.local(__file__).join('..', 'nightly.xml').read()
-
-def test_browse_nightly():
- res = browse_nightly('branch', override_xml=XML)
- assert res[('jit', 'linux')] == (40170,
'pypy-c-jit-40170-c407c9dc5382-linux.tar.bz2')
- assert len(res) == 6
- assert res[('nojit', 'linux64')] == (40170,
'pypy-c-nojit-40170-c407c9dc5382-linux64.tar.bz2')
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
