[zorg] r232691 - sanitizer-x86_64-linux-autoconf: migrate from autoconf to CMake build

[Alexey Samsonov]

Author: samsonov
Date: Wed Mar 18 18:32:18 2015
New Revision: 232691

URL: http://llvm.org/viewvc/llvm-project?rev=232691&view=rev
Log:
sanitizer-x86_64-linux-autoconf: migrate from autoconf to CMake build

Modified:
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_selector.py
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_standard.sh

Modified: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh?rev=232691&r1=232690&r2=232691&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh Wed Mar 18 18:32:18 2015
@@ -190,7 +190,7 @@ if [ $BUILD_ANDROID == 1 ] ; then
     # https://code.google.com/p/android/issues/detail?id=68779
     build_compiler_rt arm armv7-linux-androideabi
     build_llvm_symbolizer arm armv7-linux-androideabi
-    
+
     build_compiler_rt x86 i686-linux-android
     build_llvm_symbolizer x86 i686-linux-android
 fi

Modified: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_selector.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_selector.py?rev=232691&r1=232690&r2=232691&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_selector.py (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_selector.py Wed Mar 18 18:32:18 2015
@@ -29,7 +29,7 @@ BOT_ADDITIONAL_ENV = {
     'sanitizer-x86_64-linux': { 'BUILD_ANDROID' : '1', 'RUN_ANDROID' : '1', 'HAVE_NINJA' : '1' },
     'sanitizer-x86_64-linux-bootstrap': {},
     'sanitizer-x86_64-linux-fast': {},
-    'sanitizer-x86_64-linux-autoconf': { 'CHECK_TSAN': '1', 'BUILD_ASAN_ANDROID' : '1' },
+    'sanitizer-x86_64-linux-autoconf': { 'CHECK_TSAN': '1' },
     'sanitizer-x86_64-linux-fuzzer': {},
 }
 

Modified: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_standard.sh
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_standard.sh?rev=232691&r1=232690&r2=232691&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_standard.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_standard.sh Wed Mar 18 18:32:18 2015
@@ -13,27 +13,28 @@ HERE="$(dirname $0)"
 if [ "$BUILDBOT_CLOBBER" != "" ]; then
   echo @@@BUILD_STEP clobber@@@
   rm -rf llvm
-  rm -rf llvm-build
+  rm -rf clang_build
 fi
 
 ROOT=`pwd`
 PLATFORM=`uname`
 MAKE_JOBS=${MAX_MAKE_JOBS:-8}
-BUILD_ASAN_ANDROID=${BUILD_ASAN_ANDROID:-0}
 CHECK_TSAN=${CHECK_TSAN:-0}
 
+LLVM_CHECKOUT=${ROOT}/llvm
+CMAKE_COMMON_OPTIONS="-DLLVM_ENABLE_ASSERTIONS=ON"
+
 echo @@@BUILD_STEP update@@@
 buildbot_update
 
-echo @@@BUILD_STEP build clang@@@
-if [ ! -d llvm-build ]; then
-  mkdir llvm-build
+echo @@@BUILD_STEP build fresh clang@@@
+if [ ! -d clang_build ]; then
+  mkdir clang_build
 fi
-cd llvm-build
-CC=gcc CXX=g++ ../llvm/configure --enable-optimized
-make -j$MAKE_JOBS ONLY_TOOLS=clang
-cd ..
-CLANG_BUILD=$ROOT/llvm-build/Release+Asserts
+(cd clang_build && CC=gcc CXX=g++ cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+  ${CMAKE_COMMON_OPTIONS} ${LLVM_CHECKOUT})
+(cd clang_build && make clang -j$MAKE_JOBS) || echo @@@STEP_FAILURE@@@
+CLANG_PATH=$ROOT/clang_build/bin
 
 if [ $CHECK_TSAN == 1 ] ; then
   echo @@@BUILD_STEP prepare for testing tsan@@@
@@ -41,7 +42,7 @@ if [ $CHECK_TSAN == 1 ] ; then
   TSAN_PATH=$ROOT/llvm/projects/compiler-rt/lib/tsan/
   (cd $TSAN_PATH && make -f Makefile.old install_deps)
 
-  export PATH=$CLANG_BUILD/bin:$PATH
+  export PATH=$CLANG_PATH:$PATH
   export MAKEFLAGS=-j$MAKE_JOBS
   gcc -v 2>tmp && grep "version" tmp
   clang -v 2>tmp && grep "version" tmp