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

[David Blaikie]

Author: dblaikie
Date: Tue Dec  4 23:29:12 2012
New Revision: 169355

URL: http://llvm.org/viewvc/llvm-project?rev=169355&view=rev
Log:
Fixing quoting and log file paths for GDB 7.5 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=169355&r1=169354&r2=169355&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangBuilder.py Tue Dec  4 23:29:12 2012
@@ -567,11 +567,11 @@
     suppress_baseline = ''
     if not baseline:
         suppress_baseline = 'SUPPRESS_CLANG_BASELINE=1'
-    make_vars = [WithProperties('RUNTESTFLAGS=CC_FOR_TARGET="{0}/bin/clang" '
-                                'CXX_FOR_TARGET="{0}/bin/clang++" '
-                                'CFLAGS_FOR_TARGET="-w -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer" '
+    make_vars = [WithProperties('RUNTESTFLAGS=CC_FOR_TARGET=\'{0}/bin/clang\' '
+                                'CXX_FOR_TARGET=\'{0}/bin/clang++\' '
+                                'CFLAGS_FOR_TARGET=\'-w -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer\' '
                                 '{1}'.format(install_prefix, suppress_baseline)),
-                 "FORCE_PARALLEL=1"]
+                 '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',
                   workdir='clang-tests/src'))
@@ -585,8 +585,8 @@
             name='gdb-75-check',
             command=['make', '-k', WithProperties('-j%s' % jobs), 'check'] + make_vars,
             workdir='clang-tests/build',
-            logfiles={'dg.sum':'gdb.sum', 
-                      'gdb.log':'gdb.log'}))
+            logfiles={'dg.sum':'gdb/testsuite/gdb.sum', 
+                      'gdb.log':'gdb/testsuite/gdb.log'}))