wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 907552 - Add ability to specify cwd to MozbuildObject.from_environment(), r=gps

Browse Source
This commit is contained in:
Andrew Halberstadt 2013-08-22 15:24:40 -04:00
parent b4b181eaf0
commit 6aa2be2268
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
python/mozbuild/mozbuild/base.py
View File

@ -87,7 +87,7 @@ class MozbuildObject(ProcessExecutionMixin):
self._config_environment = None self._config_environment = None
@classmethod @classmethod
def from_environment(cls): def from_environment(cls, cwd=None):
"""Create a MozbuildObject by detecting the proper one from the env. """Create a MozbuildObject by detecting the proper one from the env.
This examines environment state like the current working directory and This examines environment state like the current working directory and
@ -111,6 +111,7 @@ class MozbuildObject(ProcessExecutionMixin):
If we're not inside a srcdir or objdir, an exception is raised. If we're not inside a srcdir or objdir, an exception is raised.
""" """
cwd = cwd or os.getcwd()
topsrcdir = None topsrcdir = None
topobjdir = None topobjdir = None
mozconfig = None mozconfig = None
@ -122,7 +123,7 @@ class MozbuildObject(ProcessExecutionMixin):
mozconfig = info.get('mozconfig') mozconfig = info.get('mozconfig')
return topsrcdir, topobjdir, mozconfig return topsrcdir, topobjdir, mozconfig
for dir_path in ancestors(os.getcwd()): for dir_path in ancestors(cwd):
# If we find a mozinfo.json, we are in the objdir. # If we find a mozinfo.json, we are in the objdir.
mozinfo_path = os.path.join(dir_path, 'mozinfo.json') mozinfo_path = os.path.join(dir_path, 'mozinfo.json')
if os.path.isfile(mozinfo_path): if os.path.isfile(mozinfo_path):

6
testing/mochitest/mochitest_options.py
View File

@ -12,14 +12,14 @@ from automationutils import addCommonOptions, isURL
from mozprofile import DEFAULT_PORTS from mozprofile import DEFAULT_PORTS
import moznetwork import moznetwork
here = os.path.abspath(os.path.dirname(sys.argv[0]))
try: try:
from mozbuild.base import MozbuildObject from mozbuild.base import MozbuildObject
build_obj = MozbuildObject.from_environment() build_obj = MozbuildObject.from_environment(cwd=here)
except ImportError: except ImportError:
build_obj = None build_obj = None
here = os.path.abspath(os.path.dirname(sys.argv[0]))
__all__ = ["MochitestOptions", "B2GOptions"] __all__ = ["MochitestOptions", "B2GOptions"]
VMWARE_RECORDING_HELPER_BASENAME = "vmwarerecordinghelper" VMWARE_RECORDING_HELPER_BASENAME = "vmwarerecordinghelper"