[zorg] r292344 - Removed redundant steps; fixed the wrong clang version formatting.

[Galina Kistanova via llvm-commits]

Author: gkistanova
Date: Tue Jan 17 23:41:19 2017
New Revision: 292344

URL: http://llvm.org/viewvc/llvm-project?rev=292344&view=rev
Log:
Removed redundant steps; fixed the wrong clang version formatting.

Modified:
    zorg/trunk/zorg/buildbot/builders/ClangLTOBuilder3Stage.py

Modified: zorg/trunk/zorg/buildbot/builders/ClangLTOBuilder3Stage.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangLTOBuilder3Stage.py?rev=292344&r1=292343&r2=292344&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangLTOBuilder3Stage.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangLTOBuilder3Stage.py Tue Jan 17 23:41:19 2017
@@ -45,27 +45,6 @@ def get3StageClangLTOBuildFactory(
         )
     )
 
-    # 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('=')
-        clang_ver = v.strip().strip("\'\"")
-        return { 'clang_ver' : clang_ver }
-
-    f.addStep(
-        SetProperty(
-            name="get_clang_ver",
-            command=["grep", "release =", "./tools/clang/docs/conf.py"],
-            extract_fn=getClangVer,
-            description="get clang release ver",
-            workdir=llvm_srcdir,
-            env=merged_env
-        )
-    )
-
     # Clean directory, if requested.
     cleanBuildRequested = lambda step: step.build.getProperty("clean") or clean
     f.addStep(
@@ -142,8 +121,8 @@ def get3StageClangLTOBuildFactory(
     shell_command = [
         "diff",
         "-q",
-        "tools/clang/stage2-bins/bin/clang-%(clang_ver)s",
-        "tools/clang/stage2-bins/tools/clang/stage3-bins/bin/clang-%(clang_ver)s"
+        "tools/clang/stage2-bins/bin/clang",
+        "tools/clang/stage2-bins/tools/clang/stage3-bins/bin/clang"
     ]
     f.addStep(
         ShellCommand(