[zorg] ClangAndLLDBuilder.py - Adding a missing cast and adding some asserts

[sqlbyme]

Summary

Ensuring the final string constructed for assignment to the lit_args variable is cast as a list item as it need to be in order to append it to the cmake_command variable. Also, adding some asserts to ensure we protect against incorrect types in the future.

[sqlbyme]

Galina,
I may have gone a bit overboard with the asserts, happy to hear your (or any other) opinion on the matter.

Thanks,
Mike

[sqlbyme]

After review from silvas, used the asserts in a better manner. Also removed unneeded parenthesis from the lit_args join expression.

[gkistanova]

I think, the only assert you really need here is the one for '-DLLVM_LIT_ARGS=', as it could be confusing and hard to detect. Wrong data type will fail cleanly with reasonable Python error and, up to me, does not worth a special handling. Please see more detailed explanations in D17493.

Thanks

Galina

[sqlbyme]

Removed unnecessary assertions.

[gkistanova]

LGTM.
Committed r261610

zorg/buildbot/builders/ClangAndLLDBuilder.py

     lit_args = ["-v"]
     if extraLitArgs:
         lit_args += extraLitArgs
-    lit_args_str = "-DLLVM_LIT_ARGS=\"%s\"" % (" ".join(lit_args))
 
+    lit_args = ["-DLLVM_LIT_ARGS=\"%s\"" % " ".join(lit_args)]
+
     cmakeCommand = [
         "cmake",
         "-DCMAKE_BUILD_TYPE=Release",

             "-DCMAKE_CXX_COMPILER=clang++"
         ]
     if triple:
-        cmakeCommand += [
-            "-DLLVM_DEFAULT_TARGET_TRIPLE=%s" % triple
-        ]
+        cmakeCommand += ["-DLLVM_DEFAULT_TARGET_TRIPLE=%s" % triple]
 
     if extraCmakeOptions:
-        assert not any(a.startswith('-DLLVM_LIT_ARGS=') for a in extraCmakeOptions), "Please use extraLitArgs for LIT arguments instead of defining them in extraCmakeOptions."       
+        assert not any(a.startswith('-DLLVM_LIT_ARGS=') for a in extraCmakeOptions), \
+            "Please use extraLitArgs for LIT arguments instead of defining them in extraCmakeOptions."
         cmakeCommand += extraCmakeOptions
 
     if not isMSVC:

             "-DCMAKE_C_FLAGS=\"%s\"" % (" ".join(options)),
             "-DCMAKE_CXX_FLAGS=\"-std=c++11 %s\"" % (" ".join(options)),
         ]
-    cmakeCommand += lit_args_str
+    cmakeCommand += lit_args
     cmakeCommand += [
-       "-G", "Ninja",
+       "-GNinja",
         "../%s" % llvm_srcdir
     ]