[zorg] r351777 - Added missing commas, removed excessive args.

[Galina Kistanova via llvm-commits]

Author: gkistanova
Date: Mon Jan 21 18:22:18 2019
New Revision: 351777

URL: http://llvm.org/viewvc/llvm-project?rev=351777&view=rev
Log:
Added missing commas, removed excessive args.

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py
    zorg/trunk/buildbot/osuosl/master/config/status.py
    zorg/trunk/zorg/buildbot/builders/FuchsiaBuilder.py

Modified: zorg/trunk/buildbot/osuosl/master/config/builders.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=351777&r1=351776&r2=351777&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Mon Jan 21 18:22:18 2019
@@ -1520,7 +1520,7 @@ def _get_toolchain_builders():
           {'name': "fuchsia-x86_64-linux",
            'slavenames' :["fuchsia-debian-64-us-central1-a-1", "fuchsia-debian-64-us-central1-b-1"],
            'builddir': "fuchsia-x86_64-linux",
-           'factory': FuchsiaBuilder.getToolchainBuildFactory()
+           'factory': FuchsiaBuilder.getToolchainBuildFactory(),
            'category': 'fuchsia'},
         ]
 

Modified: zorg/trunk/buildbot/osuosl/master/config/status.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/status.py?rev=351777&r1=351776&r2=351777&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/status.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/status.py Mon Jan 21 18:22:18 2019
@@ -270,6 +270,6 @@ def get_status_targets(standard_builders
             extraRecipients = ["phosek at google.com"],
             subject="Build %(builder)s Failure",
             mode = "failing",
-            builders = ["fuchsia-x86_64-linux"]
+            builders = ["fuchsia-x86_64-linux"],
             addLogs=False),
         ]

Modified: zorg/trunk/zorg/buildbot/builders/FuchsiaBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/FuchsiaBuilder.py?rev=351777&r1=351776&r2=351777&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/FuchsiaBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/FuchsiaBuilder.py Mon Jan 21 18:22:18 2019
@@ -2,6 +2,7 @@ import platform
 
 from buildbot.process.properties import WithProperties
 from buildbot.steps.shell import ShellCommand
+from buildbot.steps.slave import RemoveDirectory
 from buildbot.steps.source import SVN
 
 from zorg.buildbot.commands.CmakeCommand import CmakeCommand
@@ -55,7 +56,6 @@ def getToolchainBuildFactory(
     f.addStep(RemoveDirectory(name="clean-sdk",
                               dir=sdk_dir,
                               haltOnFailure=True,
-                              description=["remove", "fuchsia sdk"],
                               doStepIf=FileExists(sdk_dir)))
 
     f.addStep(ShellCommand(name="fetch-sdk",
@@ -64,7 +64,7 @@ def getToolchainBuildFactory(
                            workdir=sdk_dir))
 
     f.addStep(ShellCommand(name="extract-sdk",
-                           command=["unzip", "sdk.cipd"]
+                           command=["unzip", "sdk.cipd"],
                            description=["extract", "fuchsia sdk"],
                            workdir=sdk_dir))
 
@@ -74,7 +74,6 @@ def getToolchainBuildFactory(
     f.addStep(RemoveDirectory(name="clean-llvm.src",
                               dir=src_dir,
                               haltOnFailure=True,
-                              description=["rm", "src", "dir"],
                               doStepIf=cleanCheckoutRequested))
 
     # Get sources.
@@ -90,7 +89,6 @@ def getToolchainBuildFactory(
     f.addStep(RemoveDirectory(name="clean-llvm.obj",
                               dir=obj_dir,
                               haltOnFailure=True,
-                              description=["rm", "build", "dir"],
                               doStepIf=cleanBuildRequested))
 
     # Configure.
@@ -145,7 +143,7 @@ def getToolchainBuildFactory(
                            haltOnFailure=True,
                            description=["check"],
                            workdir=obj_dir,
-                           env=merged_env
+                           env=merged_env,
                            doStepIf=test))
 
     # Install distribution.