ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-03-11 06:43:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

misc/build_helpers/run_trial.py: minor refactoring -- make variable names consistent between run_trial.py and test_runner.py

Browse Source
This commit is contained in:
david-sarah 2010-11-03 18:20:27 -07:00
parent aa9af450d6
commit 50e9ed3ed0
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
misc/build_helpers/run_trial.py
View File

@ -64,18 +64,18 @@ elif os.path.normcase(os.path.basename(srcdir)) == 'site-packages':
if os.path.normcase(os.path.basename(srcdir)) == 'lib': if os.path.normcase(os.path.basename(srcdir)) == 'lib':
srcdir = os.path.dirname(srcdir) srcdir = os.path.dirname(srcdir)
srcdir = os.path.normcase(os.path.normpath(srcdir)) rootdir = os.path.normcase(os.path.normpath(srcdir))
if os.path.basename(srcdir) == 'src': if os.path.basename(rootdir) == 'src':
srcdir = os.path.dirname(srcdir) rootdir = os.path.dirname(rootdir)
cwd = os.path.normcase(os.path.normpath(os.getcwd())) root_from_cwd = os.path.normcase(os.path.normpath(os.getcwd()))
if os.path.basename(cwd) == 'src': if os.path.basename(root_from_cwd) == 'src':
cwd = os.path.dirname(cwd) root_from_cwd = os.path.dirname(root_from_cwd)
same = (srcdir == cwd) same = (root_from_cwd == rootdir)
if not same: if not same:
try: try:
same = os.path.samefile(srcdir, cwd) same = os.path.samefile(root_from_cwd, rootdir)
except AttributeError, e: except AttributeError, e:
e # hush pyflakes e # hush pyflakes
@ -83,12 +83,13 @@ if not same:
msg = ("We seem to be testing the code at %r\n" msg = ("We seem to be testing the code at %r\n"
"(according to the source filename %r),\n" "(according to the source filename %r),\n"
"but expected to be testing the code at %r.\n" "but expected to be testing the code at %r.\n"
% (srcdir, srcfile, cwd)) % (rootdir, srcfile, root_from_cwd))
cwdu = os.path.normcase(os.path.normpath(os.getcwdu())) root_from_cwdu = os.path.normcase(os.path.normpath(os.getcwdu()))
if os.path.basename(cwdu) == u'src': if os.path.basename(root_from_cwdu) == u'src':
cwdu = os.path.dirname(cwdu) root_from_cwdu = os.path.dirname(root_from_cwdu)
if not isinstance(cwd, unicode) and cwd.decode(sys.getfilesystemencoding(), 'replace') != cwdu:
if not isinstance(root_from_cwd, unicode) and root_from_cwd.decode(sys.getfilesystemencoding(), 'replace') != root_from_cwdu:
msg += ("However, this may be a false alarm because the current directory path\n" msg += ("However, this may be a false alarm because the current directory path\n"
"is not representable in the filesystem encoding. This script needs to be\n" "is not representable in the filesystem encoding. This script needs to be\n"
"run from the source directory to be tested, at a non-Unicode path.") "run from the source directory to be tested, at a non-Unicode path.")