[llvm-commits] [zorg] r168547 - /zorg/trunk/zorg/buildbot/builders/ClangBuilder.py

[Galina Kistanova]

Author: gkistanova
Date: Sat Nov 24 15:48:43 2012
New Revision: 168547

URL: http://llvm.org/viewvc/llvm-project?rev=168547&view=rev
Log:
Re-factor RUNTESTFLAGS building.

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

Modified: zorg/trunk/zorg/buildbot/builders/ClangBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangBuilder.py?rev=168547&r1=168546&r2=168547&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangBuilder.py Sat Nov 24 15:48:43 2012
@@ -561,7 +561,14 @@
                        'gdb.log' : 'obj/gdb.log' }))
 
 def addModernClangGDBTests(f, jobs, install_prefix):
-    make_vars = [WithProperties('RUNTESTFLAGS=CC_FOR_TARGET="{0}/bin/clang" CXX_FOR_TARGET="{0}/bin/clang++" CFLAGS_FOR_TARGET="-w"'.format(install_prefix)),
+    # Build a list of flags as a value of RUNTESTFLAGS var
+    # which should be a string.
+    run_test_flags = [
+        'CC_FOR_TARGET="%s/bin/clang"'    % install_prefix,
+        'CXX_FOR_TARGET="%s/bin/clang++"' % install_prefix,
+        'CFLAGS_FOR_TARGET="-w"',
+    ]
+    make_vars = [WithProperties("RUNTESTFLAGS='%s'" % (" ".join(run_test_flags))),
                  "FORCE_PARALLEL=1"]
     f.addStep(SVN(name='svn-clang-tests', mode='update',
                   svnurl='http://llvm.org/svn/llvm-project/clang-tests-external/trunk/gdb/7.5',