Author: mattip <[email protected]>
Branch:
Changeset: r71517:9ab80e27fa27
Date: 2014-05-14 22:31 +0300
http://bitbucket.org/pypy/pypy/changeset/9ab80e27fa27/
Log: fix test for windows, document and fix test for : in PYPYLOG
filename
diff --git a/pypy/doc/man/pypy.1.rst b/pypy/doc/man/pypy.1.rst
--- a/pypy/doc/man/pypy.1.rst
+++ b/pypy/doc/man/pypy.1.rst
@@ -100,6 +100,8 @@
``debug_start``/``debug_stop`` but not any nested
``debug_print``.
*fname* can be ``-`` to log to *stderr*.
+ Note that using a : in fname is a bad idea, Windows
+ users, beware.
``:``\ *fname*
Full logging, including ``debug_print``.
diff --git a/rpython/translator/c/test/test_standalone.py
b/rpython/translator/c/test/test_standalone.py
--- a/rpython/translator/c/test/test_standalone.py
+++ b/rpython/translator/c/test/test_standalone.py
@@ -304,8 +304,13 @@
assert " ll_strtod.o" in makefile
def test_debug_print_start_stop(self):
+ import sys
from rpython.rtyper.lltypesystem import rffi
-
+ if sys.platform == 'win32':
+ # ftell(stderr) is a bit different under subprocess.Popen
+ tell = 0
+ else:
+ tell = -1
def entry_point(argv):
x = "got:"
debug_start ("mycat")
@@ -327,7 +332,7 @@
t, cbuilder = self.compile(entry_point)
# check with PYPYLOG undefined
out, err = cbuilder.cmdexec("", err=True, env={})
- assert out.strip() == 'got:a.-1.'
+ assert out.strip() == 'got:a.%d.' % tell
assert 'toplevel' in err
assert 'mycat' not in err
assert 'foo 2 bar 3' not in err
@@ -336,7 +341,7 @@
assert 'bok' not in err
# check with PYPYLOG defined to an empty string (same as undefined)
out, err = cbuilder.cmdexec("", err=True, env={'PYPYLOG': ''})
- assert out.strip() == 'got:a.-1.'
+ assert out.strip() == 'got:a.%d.' % tell
assert 'toplevel' in err
assert 'mycat' not in err
assert 'foo 2 bar 3' not in err
@@ -345,7 +350,7 @@
assert 'bok' not in err
# check with PYPYLOG=:- (means print to stderr)
out, err = cbuilder.cmdexec("", err=True, env={'PYPYLOG': ':-'})
- assert out.strip() == 'got:bcda.-1.'
+ assert out.strip() == 'got:bcda.%d.' % tell
assert 'toplevel' in err
assert '{mycat' in err
assert 'mycat}' in err
@@ -374,20 +379,24 @@
assert 'bok' in data
# check with PYPYLOG=somefilename
path = udir.join('test_debug_xxx_prof.log')
- out, err = cbuilder.cmdexec("", err=True, env={'PYPYLOG': str(path)})
- size = os.stat(str(path)).st_size
- assert out.strip() == 'got:a.' + str(size) + '.'
- assert not err
- assert path.check(file=1)
- data = path.read()
- assert 'toplevel' in data
- assert '{mycat' in data
- assert 'mycat}' in data
- assert 'foo 2 bar 3' not in data
- assert '{cat2' in data
- assert 'cat2}' in data
- assert 'baz' not in data
- assert 'bok' not in data
+ if str(path).find(':')>=0:
+ # bad choice of udir, there is a ':' in it which messes up the test
+ pass
+ else:
+ out, err = cbuilder.cmdexec("", err=True, env={'PYPYLOG':
str(path)})
+ size = os.stat(str(path)).st_size
+ assert out.strip() == 'got:a.' + str(size) + '.'
+ assert not err
+ assert path.check(file=1)
+ data = path.read()
+ assert 'toplevel' in data
+ assert '{mycat' in data
+ assert 'mycat}' in data
+ assert 'foo 2 bar 3' not in data
+ assert '{cat2' in data
+ assert 'cat2}' in data
+ assert 'baz' not in data
+ assert 'bok' not in data
# check with PYPYLOG=myc:somefilename (includes mycat but not cat2)
path = udir.join('test_debug_xxx_myc.log')
out, err = cbuilder.cmdexec("", err=True,
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
