Bug 762358 - Fixup the fixup not to break on windows. r=me
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 03 Jul 2014 09:38:47 +0900
changeset 191966 56b54954e7fb18b1a7f6be81c7e2f43c8ab841cb
parent 191965 878fe076a95fa357de15fd07e15e032fbf876ca1
child 191967 9a77f132eed3a689a28d08607d77bb7cf99c2451
child 192025 0cce91c77c3f1e649180df99644a670dde6825ab
push id45721
push usermh@glandium.org
push dateThu, 03 Jul 2014 00:39:12 +0000
treeherdermozilla-inbound@56b54954e7fb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs762358
milestone33.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 762358 - Fixup the fixup not to break on windows. r=me
python/mozbuild/mozbuild/test/test_base.py
--- a/python/mozbuild/mozbuild/test/test_base.py
+++ b/python/mozbuild/mozbuild/test/test_base.py
@@ -72,19 +72,20 @@ class TestMozbuildObject(unittest.TestCa
 
             self.assertEqual(base.topobjdir, os.path.join(base.topsrcdir,
                 'foo'))
             self.assertTrue(base.topobjdir.endswith('foo'))
 
     def test_objdir_config_status(self):
         """Ensure @CONFIG_GUESS@ is handled when loading mozconfig."""
         base = self.get_base()
-        guess = subprocess.check_output(
+        cmd = base._normalize_command(
             [os.path.join(topsrcdir, 'build', 'autoconf', 'config.guess')],
-            cwd=topsrcdir).strip()
+            True)
+        guess = subprocess.check_output(cmd, cwd=topsrcdir).strip()
 
         # There may be symlinks involved, so we use real paths to ensure
         # path consistency.
         d = os.path.realpath(tempfile.mkdtemp())
         try:
             mozconfig = os.path.join(d, 'mozconfig')
             with open(mozconfig, 'wt') as fh:
                 fh.write('mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/foo/@CONFIG_GUESS@')