[zorg] Correcting a bug in ClangLTO3StageBuilder.py.

[sqlbyme]

Summary

Patch by Galina Kistanova & Mike Edwards

Galina fixed a bug by producing a much more elegant way to extract the current clang release version, which we need to set as a Buildbot property.

I fixed the fact that I had labeled the property incorrectly. It is now labeled correctly: clang_ver
I also corrected some of the names for build steps so they are more descriptive.

[gkistanova]

LGTM

Thanks

Galina

[gkistanova]

Committed r262097

[silvas]

Why do you need the version in the first place? Just there should be a plain clang in the directory too.

Really though, we should be checking every binary in both directories. How about adding a script utils/diffbindirs.py and then just call python utils/diffbindirs.py tools/clang/stage2-bins/bin/ tools/clang/stage2-bins/tools/clang/stage3-bins/bin/?

[sqlbyme]

I will admit that I do not understand enough about how diff works to be confident that diff'ing the symbolic link to the binary would produce the same result as diff'ing the binary itself. It seems to. Probably dumb, but I wanted to be able to say with absolute certainty that I was diff'ing the just built binaries.

That said, I like your idea of a script that will diff all of the files in the stage2-bins and stage3-bins directories. I'll work on that.

zorg/buildbot/builders/ClangLTOBuilder3Stage.py

     )
 
     # We have to programatically determine the current llvm version.
+    def getClangVer(exit_status, stdout, stderr):
+        # We expect something like this:
+        # release = '3.9'
+        if exit_status:
+           return {}
+        k,v = stdout.split('=')
+        llvm_ver = v.strip().strip("\'\"")
+        return { 'clang_ver' : clang_ver }
+
     f.addStep(
         SetProperty(
-            name="get_llvm_ver",
-            command=["grep 'release =' %s/tools/clang/docs/conf.py | awk '{print $3;}' | sed \"s/'//g\"" % llvm_srcdir],
-            property="llvm_ver",
-            description="get llvm release ver",
+            name="get_clang_ver",
+            command=["grep", "release =", "./tools/clang/docs/conf.py"],
+            extract_fn=getClangVer,
+            property="clang_ver",
+            description="get clang release ver",
             workdir=llvm_srcdir,
             env=merged_env
         )

 
     if build_gold:
         f.addStep(
-            NinjaCommand(name='build',
+            NinjaCommand(name='build-LLVMgold.so',
                 targets=['lib/LLVMgold.so'],
                 haltOnFailure=True,
                 warnOnWarnings=True,

         )
 
     f.addStep(
-        NinjaCommand(name='build',
+        NinjaCommand(name='build-stage3-clang',
             targets=['stage3-clang'],
             haltOnFailure=True,
             warnOnWarnings=True,

     )
 
     f.addStep(
-        NinjaCommand(name='build',
+        NinjaCommand(name='build-stage3-check-clang',
             targets=['stage3-check-clang'],
             haltOnFailure=True,
             warnOnWarnings=True,

     shell_command = [
         "diff",
         "-q",
-        "tools/clang/stage2-bins/bin/clang-%(llvm_ver)s",
-        "tools/clang/stage2-bins/tools/clang/stage3-bins/bin/clang-%(llvm_ver)s"
+        "tools/clang/stage2-bins/bin/clang-%(clang_ver)s",
+        "tools/clang/stage2-bins/tools/clang/stage3-bins/bin/clang-%(clang_ver)s"
     ]
     f.addStep(
         ShellCommand(
-            name="compare",
+            name="compare-clang",
             description=["comapre stage2 & stage3 clang"],
             haltOnFailure=True,
             command=WithProperties(" ".join(shell_command)),