$OpenBSD$ index 2b2b53a..24118cd 100644 --- python/mozbuild/mozbuild/test/test_base.py.orig Fri Feb 20 15:40:38 2015 +++ python/mozbuild/mozbuild/test/test_base.py Fri Feb 20 15:40:38 2015 @@ -7,6 +7,7 @@ from __future__ import unicode_literals import json import os import shutil +import subprocess import sys import tempfile import unittest @@ -75,7 +76,10 @@ class TestMozbuildObject(unittest.TestCase): def test_objdir_config_status(self): """Ensure @CONFIG_GUESS@ is handled when loading mozconfig.""" base = self.get_base() - guess = base._config_guess + cmd = base._normalize_command( + [os.path.join(topsrcdir, 'build', 'autoconf', 'config.guess')], + True) + guess = subprocess.check_output(cmd, cwd=topsrcdir).strip() # There may be symlinks involved, so we use real paths to ensure # path consistency.