Bug 1239738 - Handle artifact builds with no test binaries cleanly. r=ahunt
authorNick Alexander <nalexander@mozilla.com>
Thu, 14 Jan 2016 09:38:48 -0800
changeset 280126 2c23bb770b54555a7320dd87cec45dfc7eaafa31
parent 280125 03215fabd7fb1932e8fa402598092f8b2a7c4131
child 280127 adbce5cdc59284f846ef6efd3f0ecd773fbe94e7
push id70334
push usercbook@mozilla.com
push dateFri, 15 Jan 2016 10:48:53 +0000
treeherdermozilla-inbound@de9a0fc7828d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersahunt
bugs1239738
milestone46.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 1239738 - Handle artifact builds with no test binaries cleanly. r=ahunt DONTBUILD NPOTB on a CLOSED TREE
python/mozbuild/mozbuild/artifacts.py
--- a/python/mozbuild/mozbuild/artifacts.py
+++ b/python/mozbuild/mozbuild/artifacts.py
@@ -118,19 +118,19 @@ class ArtifactJob(object):
         if self._log:
             self._log(*args, **kwargs)
 
     def find_candidate_artifacts(self, artifacts):
         # TODO: Handle multiple artifacts, taking the latest one.
         tests_artifact = None
         for artifact in artifacts:
             name = artifact['name']
-            if self._package_re.match(name):
+            if self._package_re and self._package_re.match(name):
                 yield name
-            elif self._tests_re.match(name):
+            elif self._tests_re and self._tests_re.match(name):
                 tests_artifact = name
                 yield name
             else:
                 self.log(logging.DEBUG, 'artifact',
                          {'name': name},
                          'Not yielding artifact named {name} as a candidate artifact')
         if self._tests_re and not tests_artifact:
             raise ValueError('Expected tests archive matching "{re}", but '