Bug 1575135 - Fix mock_pkg_config failure case. r=nalexander
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 20 Aug 2019 16:42:06 +0000
changeset 489117 fd9f4d8f171b33418c39979623747cc7af3d5932
parent 489116 38e02cd63d8df54f920d4b0b787df1fcbc3c8973
child 489118 f3e3d13c202ad2078d8c1e27db4970191772e74d
push id93137
push usermh@glandium.org
push dateWed, 21 Aug 2019 05:05:13 +0000
treeherderautoland@b651185f9573 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1575135
milestone70.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 1575135 - Fix mock_pkg_config failure case. r=nalexander It only happens when things go badly, which is why it doesn't cause problems, but when moving things around, triggering the error, we currently get a formatting error rather than the actual error. Differential Revision: https://phabricator.services.mozilla.com/D42602
python/mozbuild/mozbuild/test/configure/test_checks_configure.py
--- a/python/mozbuild/mozbuild/test/configure/test_checks_configure.py
+++ b/python/mozbuild/mozbuild/test/configure/test_checks_configure.py
@@ -647,17 +647,17 @@ Java SDK directory or use '--with-java-b
             if args[0] == '--cflags':
                 assert len(args) == 2
                 return 0, '-I/usr/include/%s' % args[1], ''
             if args[0] == '--libs':
                 assert len(args) == 2
                 return 0, '-l%s' % args[1], ''
             if args[0] == '--version':
                 return 0, mock_pkg_config_version, ''
-            self.fail("Unexpected arguments to mock_pkg_config: %s" % args)
+            self.fail("Unexpected arguments to mock_pkg_config: %s" % (args,))
 
         def get_result(cmd, args=[], extra_paths=None):
             return self.get_result(textwrap.dedent('''\
                 option('--disable-compile-environment', help='compile env')
                 compile_environment = depends(when='--enable-compile-environment')(lambda: True)
                 toolchain_prefix = depends(when=True)(lambda: None)
                 include('%(topsrcdir)s/build/moz.configure/util.configure')
                 include('%(topsrcdir)s/build/moz.configure/checks.configure')