Index: zorg/buildbot/builders/ClangLTOBuilder3Stage.py =================================================================== --- zorg/buildbot/builders/ClangLTOBuilder3Stage.py +++ zorg/buildbot/builders/ClangLTOBuilder3Stage.py @@ -74,9 +74,11 @@ cmake_command = ["cmake"] if cmake_cache_file: - cmake_command += "-C %s" % (" ".join(cmake_cache_file)) + assert isinstance(cmake_cache_file, str) + cmake_command += ['-C', cmake_cache_file] if extra_cmake_options: + assert isinstance(extra_cmake_options, list) cmake_command += extra_cmake_options cmake_command += [ @@ -128,7 +130,12 @@ ) # Compare stage2 & stage3 clang - 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"] + 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" + ] f.addStep( ShellCommand( name="compare",