Merge mozilla-central to mozilla-inbound. CLOSED TREE
authorCsoregi Natalia <ncsoregi@mozilla.com>
Fri, 17 May 2019 02:13:32 +0300
changeset 536205 5dd54f014ddd53b3114cb438162fc35ff53b0d93
parent 536204 c37ca68a24e5a38192a1ef8ccf01c406ccc511ce (current diff)
parent 536133 3d88030030a181816e5fe300b6b8d66cb718d8ba (diff)
child 536206 a67530e635b1a1b676a101150ac4c0e4cb73801b
push id2082
push userffxbld-merge
push dateMon, 01 Jul 2019 08:34:18 +0000
treeherdermozilla-release@2fb19d0466d2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone68.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
Merge mozilla-central to mozilla-inbound. CLOSED TREE
--- a/python/mozbuild/mozbuild/frontend/context.py
+++ b/python/mozbuild/mozbuild/frontend/context.py
@@ -1978,21 +1978,20 @@ VARIABLES = {
 
     'PYTHON_UNITTEST_MANIFESTS': (ManifestparserManifestList, list,
                                   """List of manifest files defining python unit tests.
         """),
 
     'CRAMTEST_MANIFESTS': (ManifestparserManifestList, list,
                            """List of manifest files defining cram unit tests.
         """),
-    
+
     'TELEMETRY_TESTS_CLIENT_MANIFESTS': (ManifestparserManifestList, list,
-        """List of manifest files defining telemetry client tests.
+                                         """List of manifest files defining telemetry client tests.
         """),
-    
 
 
     # The following variables are used to control the target of installed files.
     'XPI_NAME': (unicode, unicode,
                  """The name of an extension XPI to generate.
 
         When this variable is present, the results of this directory will end up
         being packaged into an extension instead of the main dist/bin results.