Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Partial back-out of changeset 4b63e7093115 | Armin Rigo | 2017-04-05 | 34 | -0/+0 |
| | | | | | | This should cancel the change to ALL FILES that turns them executable. The present backout has been manually tweaked so that it does not actually contain any change to file contents. | ||||
* | conditionally call vmp_native_enable/disable (only if platform supports it), ↵ | Richard Plangger | 2017-04-03 | 34 | -0/+0 |
| | | | | VMP_SUPPORTS_NATIVE_PROFILING defined on x86 | ||||
* | Reduce the diff with the original | Armin Rigo | 2016-12-20 | 1 | -3/+8 |
| | |||||
* | Maybe temporary: change py.test, which displays unicode strings 'xx' | Armin Rigo | 2016-12-20 | 1 | -3/+3 |
| | | | | | instead of u'xx'. It's very annoying when the difference is essential, like in the py3.5-newtext branch. | ||||
* | hg merge default | Ronan Lamy | 2016-11-15 | 3 | -2/+34 |
|\ | |||||
| * | Backout 44c3924 : no need to patch dead code | Ronan Lamy | 2014-09-01 | 1 | -2/+0 |
| | | |||||
| * | Add two README files in "py" and "_pytest". PLEASE READ THEM | Armin Rigo | 2014-09-01 | 1 | -0/+17 |
| | | | | | | | | when updating these! | ||||
| * | reapply dc81116ff4b7 | Armin Rigo | 2014-09-01 | 1 | -0/+2 |
| | | |||||
| * | Reapply fix c6f52c21fe7e | Armin Rigo | 2014-09-01 | 1 | -1/+16 |
| | | |||||
| * | Accept a plain string and don't try to decode it to unicode and then | Armin Rigo | 2014-08-31 | 1 | -1/+1 |
| | | | | | | | | re-encode it to utf-8. It may not work. | ||||
* | | copy upstream pytest-2.9.2 and py-1.4.29 | Ronan Lamy | 2016-11-15 | 9 | -146/+238 |
|/ | |||||
* | sync to pytest 2.5.2 and pylib 1.4.20 | Ronan Lamy | 2014-04-12 | 17 | -353/+659 |
| | |||||
* | Increase the resistence of make_numbered_dir() against multiple | Armin Rigo | 2013-04-29 | 1 | -1/+16 |
| | | | | processes | ||||
* | Add a quick hack to prevent py.test from taking forever to display certain | Armin Rigo | 2013-01-25 | 1 | -0/+2 |
| | | | | tracebacks. | ||||
* | seems my hacks made assertion worse | Maciej Fijalkowski | 2012-10-28 | 1 | -3/+3 |
| | |||||
* | try to mitigate "it takes forever" on py.test | Maciej Fijalkowski | 2012-10-22 | 1 | -3/+3 |
| | |||||
* | Spelling and grammatical errors spotted by lintian | Stefano Rivera | 2012-10-10 | 1 | -3/+3 |
| | |||||
* | re-add (again) these files, they are needed by buildbot (I think). See also ↵ | Antonio Cuni | 2012-04-10 | 2 | -0/+41 |
| | | | | e12baeb2c897 | ||||
* | upgrade py and _pytest to current tip | Ronny Pfannschmidt | 2012-04-09 | 5 | -9/+22 |
| | |||||
* | sync pylib with 1.7.4 + mattip's patch | Ronny Pfannschmidt | 2012-02-17 | 2 | -10/+25 |
| | |||||
* | syncronize pylib and pytest with current hg versions | Ronny Pfannschmidt | 2012-01-21 | 17 | -83/+1126 |
| | |||||
* | Fix an occasional IndexError. | Armin Rigo | 2011-12-07 | 1 | -0/+1 |
| | | | | | | | (I should try to figure out if the trunk py lib still has the same issue, and write a test for it if it does, but I don't really follow the trunk py lib, so I'm just checking this here and it can be ignored if we update the py lib.) | ||||
* | make more tests pass | Maciej Fijalkowski | 2011-11-13 | 1 | -1/+1 |
| | |||||
* | Fix an UnboundLocalError. | Armin Rigo | 2011-09-22 | 1 | -1/+1 |
| | |||||
* | drag py/bin/py.test back from the graveyard | Benjamin Peterson | 2011-06-14 | 2 | -0/+41 |
| | |||||
* | update py.test again (now with 2.5 support) | Benjamin Peterson | 2011-06-14 | 7 | -1056/+5 |
| | |||||
* | chmod +x py.test | Antonio Cuni | 2011-06-14 | 1 | -0/+0 |
| | |||||
* | Backout changes 3c0ae7fce1c7 to cfbda2605f9d | Armin Rigo | 2011-06-14 | 7 | -5/+1056 |
| | | | | | | We should discuss on irc whether it's a good idea or not. Most importantly, this doesn't seem to work on Python 2.5, which I find to be still an important platform. | ||||
* | upgrade to latest development version of py.test | Benjamin Peterson | 2011-06-13 | 7 | -1056/+5 |
| | |||||
* | use actually released pytest-2.0.3 / py-1.4.3 versions | holger krekel | 2011-04-28 | 2 | -2/+3 |
| | | | | (minor fixes compared to the versions pypy already used) | ||||
* | Fix large writes on win32 console | Amaury Forgeot d'Arc | 2011-03-22 | 1 | -0/+3 |
| | |||||
* | using dev version of py with terminal coloring fix (thanks amaury for ↵ | holger krekel | 2011-03-11 | 2 | -3/+6 |
| | | | | pointing out) | ||||
* | actually exit with proper exit code | holger krekel | 2011-03-11 | 1 | -1/+1 |
| | |||||
* | (really) re-add py/bin/py.test and py/bin/_findpy.py to ease transition wrt ↵ | holger krekel | 2011-03-07 | 2 | -0/+41 |
| | | | | to nightly jobs | ||||
* | remove py/bin/py.test script because we neccessarily have pytest.py at root ↵ | holger krekel | 2011-03-06 | 2 | -55/+0 |
| | | | | | | | | | | | level anyway. the root pytest.py is now a modified version of the file from the pytest distribution because I want to disable warnings for people who have installed py.test indepedently from PyPy. Also fix up the docs a bit more to hint / move towards this possibility. also fix the docs to point to "pytest.py" instead of "pypy/test_all.py" which should die at some point. | ||||
* | inline update to latest py version | holger krekel | 2011-03-06 | 1 | -1/+1 |
| | |||||
* | update to current py and pytest trunk | holger krekel | 2011-03-06 | 5 | -21/+13 |
| | |||||
* | for now re-add some helping scripts used from pypy buildbot invocations | holger krekel | 2011-01-18 | 2 | -0/+55 |
| | |||||
* | remove old py copy, add current pytest and py lib snapshots (from ↵ | holger krekel | 2011-01-18 | 99 | -8316/+1128 |
| | | | | | | pytest-2.0.1dev and py-1.4.1dev) and some initial tweeks to conftest.py | ||||
* | A fix for https://bitbucket.org/hpk42/py/issue/2 | Amaury Forgeot d'Arc | 2010-12-15 | 1 | -1/+1 |
| | | | | which is needed because "hg" is a .cmd script on Windows | ||||
* | refine unicode handling for py.process.cmdexec | Holger Krekel | 2010-06-25 | 1 | -5/+10 |
| | |||||
* | Grumble. sys.stdout.encoding can be None | Maciej Fijalkowski | 2010-06-18 | 1 | -2/+4 |
| | |||||
* | This seems to fix some of 64bit issues. A bit "what the hell", but makes | Maciej Fijalkowski | 2010-06-16 | 1 | -2/+2 |
| | | | | some sort of sense. | ||||
* | fix assertion interpretation with pow | Benjamin Peterson | 2010-06-10 | 1 | -0/+1 |
| | |||||
* | When building the explanation of failed assertions, | Amaury Forgeot d'Arc | 2010-06-10 | 1 | -26/+26 |
| | | | | | | | | | don't compile() code ourselves, but pass the source to frame.eval(). This helps when running AppTests with cpython2.7, where the opcodes as incompatible with the pypy interpreter. I could not convert the calls to pycodegen, but I'm not sure what they are useful for. | ||||
* | defer compilation to frame.eval so that pypy can override and compile to ↵ | Holger Krekel | 2010-06-10 | 1 | -3/+2 |
| | | | | bytecode on its own | ||||
* | also copy the py.code.compile fix to trunk (it can obscure/fail on ↵ | Holger Krekel | 2010-06-06 | 1 | -2/+5 |
| | | | | traceback-printing, especially with generated code entries being in the traceback) | ||||
* | this is now released, a last fix for python3 | Holger Krekel | 2010-05-25 | 1 | -0/+1 |
| | |||||
* | introducing --maxfail=NUM option , hopefully the last 1.3.1 candidate | Holger Krekel | 2010-05-25 | 5 | -15/+30 |
| | |||||
* | update to py-1.3.1 release candidate | Holger Krekel | 2010-05-22 | 8 | -43/+79 |
| |