commit 5bdc20b343937698e072beabe7e36448138b76ea
author Andrei Lebedev <alebedev@accesssoftek.com> Mon Sep 28 00:03:00 2020 -0700
committer Galina Kistanova <gkistanova@gmail.com> Tue Oct 27 00:25:20 2020 -0700
tree cb5a0f69070391bb41f19783e003f0d66b36f0f4
parent 682000952c2737b37a7038c5a10fdf6edb1301bb

Ported LLDPerformanceTestsuite.

zorg/buildbot/builders/LLDPerformanceTestsuite.py

diff --git a/zorg/buildbot/builders/LLDPerformanceTestsuite.py b/zorg/buildbot/builders/LLDPerformanceTestsuite.py
index 22f5c44..9525e7f 100644
--- a/zorg/buildbot/builders/LLDPerformanceTestsuite.py
+++ b/zorg/buildbot/builders/LLDPerformanceTestsuite.py
@@ -20,7 +20,7 @@
     merged_env = {
         'TERM' : 'dumb' # Make sure Clang doesn't use color escape sequences.
         }
-    if env is not None:
+    if env:
         # Overwrite pre-set items with the given ones, so user can set anything.
         merged_env.update(env)
 
@@ -60,7 +60,7 @@
             **kwargs) # Pass through all the extra arguments.
 
     if targets:
-        step_name = "build-%s" % ("-".join(targets))
+        step_name = "build-{}".format("-".join(targets))
         step_description=["Build"]
         step_description.extend(targets)
     else:
@@ -78,7 +78,7 @@
 
     # Test just built components if requested.
     if checks:
-        f.addStep(NinjaCommand(name="test-%s" % ("-".join(checks)),
+        f.addStep(NinjaCommand(name="test-{}".format("-".join(checks)),
                                targets=checks,
                                description=[
                                    "Test", "just", "built", "components"],
@@ -98,7 +98,7 @@
                 "test", "suite",
                 ],
             command=[
-                "cp", "-aL", "./%s/bin/ld.lld" % f.obj_dir, "./lld-speed-test/ld.lld"
+                "cp", "-aL", "./{}/bin/ld.lld".format(f.obj_dir), "./lld-speed-test/ld.lld"
                 ],
             env=merged_env,
             workdir='.'
@@ -108,8 +108,8 @@
     # Run the performance test suite.
     perf_command = [
         "python",
-        "%(workdir)s/lld-benchmark.py",
-        "--machine=%(slavename)s",
+        "%(builddir)s/lld-benchmark.py",
+        "--machine=%(workername)s",
         "--revision=%(got_revision)s",
         "--linker=./ld.lld",
         ".",