[zorg] r209325 - Few changes for builder sanitizer_x86_64-freeBSD9.2.

[Galina Kistanova]

Author: gkistanova
Date: Wed May 21 17:03:25 2014
New Revision: 209325

URL: http://llvm.org/viewvc/llvm-project?rev=209325&view=rev
Log:
Few changes for builder sanitizer_x86_64-freeBSD9.2.
Fixed -DCMAKE_CXX_FLAGS value;
Removed asan testing due to execution time.

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py
    zorg/trunk/zorg/buildbot/builders/SanitizerBuilderII.py

Modified: zorg/trunk/buildbot/osuosl/master/config/builders.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=209325&r1=209324&r2=209325&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Wed May 21 17:03:25 2014
@@ -606,6 +606,7 @@ def _get_sanitizer_builders():
            'builddir':"sanitizer_x86_64-freeBSD9.2",
            'factory' : SanitizerBuilderII.getSanitizerBuildFactoryII(
                                           clean=True,
+                                          sanitizers=['sanitizer','lsan','msan','tsan','ubsan','dfsan'],
                                           common_cmake_options='-DCMAKE_EXE_LINKER_FLAGS=-lcxxrt')},
           ]
 

Modified: zorg/trunk/zorg/buildbot/builders/SanitizerBuilderII.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/SanitizerBuilderII.py?rev=209325&r1=209324&r2=209325&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/SanitizerBuilderII.py (original)
+++ zorg/trunk/zorg/buildbot/builders/SanitizerBuilderII.py Wed May 21 17:03:25 2014
@@ -198,7 +198,7 @@ def getSanitizerBuildFactoryII(
             "%s" % common_cmake_options,
             "-DCMAKE_C_COMPILER=%s/clang" % clang_path,
             "-DCMAKE_CXX_COMPILER=%s/clang++" % clang_path,
-            "-DCMAKE_CXX_FLAGS=-I" + "%(builddir)s" + "/%s/projects/libcxx/include -std=c++11 -stdlib=libc++" % llvm_srcdir,
+            "-DCMAKE_CXX_FLAGS='-I" + "%(builddir)s" + "/%s/projects/libcxx/include -std=c++11 -stdlib=libc++'" % llvm_srcdir,
             "../%s" % llvm_srcdir]
     else:
        cmakeCommand_llvm64 = [
@@ -206,7 +206,7 @@ def getSanitizerBuildFactoryII(
             "-DCMAKE_BUILD_TYPE=%s" % build_type,
             "-DCMAKE_C_COMPILER=%s/clang" % clang_path,
             "-DCMAKE_CXX_COMPILER=%s/clang++" % clang_path,
-            "-DCMAKE_CXX_FLAGS=-I" + "%(builddir)s" + "/%s/projects/libcxx/include -std=c++11 -stdlib=libc++" % llvm_srcdir,
+            "-DCMAKE_CXX_FLAGS='-I" + "%(builddir)s" + "/%s/projects/libcxx/include -std=c++11 -stdlib=libc++'" % llvm_srcdir,
             "../%s" % llvm_srcdir]
 
     # Note: ShellCommand does not pass the params with special symbols correctly.