[zorg] r305982 - [sanitizers] Remove _CHECKOUT prefix from some variables for consistency

Vitaly Buka via llvm-commits llvm-commits at lists.llvm.org
Wed Jun 21 18:57:25 PDT 2017 

Author: vitalybuka
Date: Wed Jun 21 20:57:24 2017
New Revision: 305982

URL: http://llvm.org/viewvc/llvm-project?rev=305982&view=rev
Log:
[sanitizers] Remove _CHECKOUT prefix from some variables for consistency

Modified:
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_functions.sh
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_perf_asan.sh
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_standard.sh

Modified: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh?rev=305982&r1=305981&r2=305982&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh Wed Jun 21 20:57:24 2017
@@ -23,7 +23,7 @@ function build_llvm_symbolizer { # ARCH
         -DLLVM_BUILD_RUNTIME=OFF \
         -DLLVM_TABLEGEN=$ROOT/llvm_build64/bin/llvm-tblgen \
         ${CMAKE_COMMON_OPTIONS} \
-        $LLVM_CHECKOUT || echo @@@STEP_FAILURE@@@
+        $LLVM || echo @@@STEP_FAILURE@@@
     ninja llvm-symbolizer || echo @@@STEP_FAILURE@@@
 
     cd ..
@@ -59,7 +59,7 @@ function build_compiler_rt { # ARCH trip
         -DCOMPILER_RT_OUTPUT_DIR="$ANDROID_LIBRARY_OUTPUT_DIR" \
         -DCOMPILER_RT_EXEC_OUTPUT_DIR="$ANDROID_EXEC_OUTPUT_DIR" \
         ${CMAKE_COMMON_OPTIONS} \
-        $LLVM_CHECKOUT/projects/compiler-rt || echo @@@STEP_FAILURE@@@
+        $LLVM/projects/compiler-rt || echo @@@STEP_FAILURE@@@
     ninja asan || echo @@@STEP_FAILURE@@@
     ls "$ANDROID_LIBRARY_OUTPUT_DIR"
     ninja AsanUnitTests SanitizerUnitTests || echo @@@STEP_FAILURE@@@

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=305982&r1=305981&r2=305982&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh Wed Jun 21 20:57:24 2017
@@ -26,9 +26,9 @@ rm -rf compiler_rt_build llvm_build64 ll
 
 SUPPORTS_32_BITS=${SUPPORTS_32_BITS:-1}
 MAKE_JOBS=${MAX_MAKE_JOBS:-16}
-LLVM_CHECKOUT=$ROOT/llvm
+LLVM=$ROOT/llvm
 ZLIB=$ROOT/zlib
-COMPILER_RT_CHECKOUT=$LLVM_CHECKOUT/projects/compiler-rt
+COMPILER_RT=$LLVM/projects/compiler-rt
 CMAKE_COMMON_OPTIONS="-DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_PARALLEL_LINK_JOBS=10"
 ENABLE_LIBCXX_FLAG=
 if [ "$PLATFORM" == "Darwin" ]; then
@@ -111,8 +111,8 @@ echo @@@BUILD_STEP update@@@
 buildbot_update
 
 echo @@@BUILD_STEP lint@@@
-CHECK_LINT=${COMPILER_RT_CHECKOUT}/lib/sanitizer_common/scripts/check_lint.sh
-(LLVM_CHECKOUT=${LLVM_CHECKOUT} ${CHECK_LINT}) || echo @@@STEP_WARNINGS@@@
+CHECK_LINT=${COMPILER_RT}/lib/sanitizer_common/scripts/check_lint.sh
+(LLVM=${LLVM} ${CHECK_LINT}) || echo @@@STEP_WARNINGS@@@
 
 # Use both gcc and just-built Clang as a host compiler for sanitizer tests.
 # Assume that self-hosted build tree should compile with -Werror.
@@ -120,12 +120,12 @@ echo @@@BUILD_STEP build fresh clang@@@
 if [ ! -d clang_build ]; then
   mkdir clang_build
 fi
-(cd clang_build && cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo ${CMAKE_COMMON_OPTIONS} $LLVM_CHECKOUT)
+(cd clang_build && cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo ${CMAKE_COMMON_OPTIONS} $LLVM)
 (cd clang_build && make clang -j$MAKE_JOBS) || (echo @@@STEP_FAILURE@@@ ; exit 1)
 
 # If we're building with libcxx, install the headers to clang_build/include.
 if [ ! -z ${ENABLE_LIBCXX_FLAG} ]; then
-(cd clang_build && make -C ${LLVM_CHECKOUT}/projects/libcxx installheaders \
+(cd clang_build && make -C ${LLVM}/projects/libcxx installheaders \
   HEADER_DIR=${PWD}/include) || echo @@@STEP_FAILURE@@@
 fi
 
@@ -163,14 +163,14 @@ if [ ! -d llvm_build64 ]; then
 fi
 (cd llvm_build64 && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
     ${CMAKE_CLANG_OPTIONS} -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON \
-    ${ENABLE_LIBCXX_FLAG} $LLVM_CHECKOUT)
+    ${ENABLE_LIBCXX_FLAG} $LLVM)
 
 # First, build only Clang.
 (cd llvm_build64 && make -j$MAKE_JOBS clang) || echo @@@STEP_FAILURE@@@
 
 # If needed, install the headers to clang_build/include.
 if [ ! -z ${ENABLE_LIBCXX_FLAG} ]; then
-(cd llvm_build64 && make -C ${LLVM_CHECKOUT}/projects/libcxx installheaders \
+(cd llvm_build64 && make -C ${LLVM}/projects/libcxx installheaders \
   HEADER_DIR=${PWD}/include) || echo @@@STEP_FAILURE@@@
 fi
 
@@ -220,7 +220,7 @@ fi
   -DCOMPILER_RT_INCLUDE_TESTS=ON \
   -DCOMPILER_RT_ENABLE_WERROR=ON \
   -DLLVM_CONFIG_PATH=${FRESH_CLANG_PATH}/llvm-config \
-  $COMPILER_RT_CHECKOUT)
+  $COMPILER_RT)
 (cd compiler_rt_build && make -j$MAKE_JOBS) || echo @@@STEP_FAILURE@@@
 
 echo @@@BUILD_STEP test standalone compiler-rt@@@
@@ -233,7 +233,7 @@ build_symbolizer() {
   fi
   (cd symbolizer_build$1 && ZLIB_SRC=$ZLIB FLAGS=-m$1 \
     CLANG=${FRESH_CLANG_PATH}/clang \
-    bash -eux $COMPILER_RT_CHECKOUT/lib/sanitizer_common/symbolizer/scripts/build_symbolizer.sh \
+    bash -eux $COMPILER_RT/lib/sanitizer_common/symbolizer/scripts/build_symbolizer.sh \
       $(dirname $(find ../$2/ -name libclang_rt.*.a | head -n1)) || echo @@@STEP_FAILURE@@@)
 }
 
@@ -257,8 +257,8 @@ if [ "$PLATFORM" == "Linux" -a $HAVE_NIN
   fi
   CMAKE_NINJA_OPTIONS="${CMAKE_CLANG_OPTIONS} -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -G Ninja"
   (cd llvm_build_ninja && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
-      ${CMAKE_NINJA_OPTIONS} $LLVM_CHECKOUT)
-  ln -sf llvm_build_ninja/compile_commands.json $LLVM_CHECKOUT
+      ${CMAKE_NINJA_OPTIONS} $LLVM)
+  ln -sf llvm_build_ninja/compile_commands.json $LLVM
   (cd llvm_build_ninja && ninja) || echo @@@STEP_FAILURE@@@
 
   check_ninja() {

Modified: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_functions.sh
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_functions.sh?rev=305982&r1=305981&r2=305982&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_functions.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_functions.sh Wed Jun 21 20:57:24 2017
@@ -67,11 +67,11 @@ function fetch_depot_tools {
 }
 
 function check_out_chromium {
-  CHROME_CHECKOUT=$1
+  CHROME=$1
   (
-  if [ ! -d $CHROME_CHECKOUT ]; then
-    mkdir $CHROME_CHECKOUT
-    pushd $CHROME_CHECKOUT
+  if [ ! -d $CHROME ]; then
+    mkdir $CHROME
+    pushd $CHROME
     fetch --nohooks chromium --nosvn=True 
 
     # Sync to LKGR, see http://crbug.com/109191
@@ -81,7 +81,7 @@ function check_out_chromium {
     rm .gclient-tmp
     popd
   fi
-  cd $CHROME_CHECKOUT/src
+  cd $CHROME/src
   git checkout master
   git pull
   gclient sync --nohooks --jobs=16
@@ -89,11 +89,11 @@ function check_out_chromium {
 }
 
 function gclient_runhooks {
-  CHROME_CHECKOUT=$1
+  CHROME=$1
   CLANG_BUILD=$2
   CUSTOM_GYP_DEFINES=$3
   (
-  cd $CHROME_CHECKOUT/src
+  cd $CHROME/src
   
   # Clobber Chromium to catch possible LLVM regressions early.
   rm -rf out/Release

Modified: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_perf_asan.sh
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_perf_asan.sh?rev=305982&r1=305981&r2=305982&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_perf_asan.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_perf_asan.sh Wed Jun 21 20:57:24 2017
@@ -11,7 +11,7 @@ ROOT=`pwd`
 PLATFORM=`uname`
 export PATH="/usr/local/bin:$PATH"
 
-LLVM_CHECKOUT=$ROOT/llvm
+LLVM=$ROOT/llvm
 CLANG_BUILD=$ROOT/clang_build
 SPEC_DIRNAME=SPEC_CPU2006v1.2
 SPEC_SRC="${ROOT}/${SPEC_DIRNAME}"
@@ -45,7 +45,7 @@ if [ ! -d $CLANG_BUILD ]; then
 fi
 cd $CLANG_BUILD
 export PATH="$PATH:$ROOT/../../../ninja"
-cmake -DCMAKE_BUILD_TYPE=Release ${CMAKE_COMMON_OPTIONS} $LLVM_CHECKOUT
+cmake -DCMAKE_BUILD_TYPE=Release ${CMAKE_COMMON_OPTIONS} $LLVM
 ninja clang || echo @@@STEP_FAILURE@@@
 # TODO(glider): build other targets depending on the platform.
 # See https://code.google.com/p/address-sanitizer/wiki/HowToBuild.

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=305982&r1=305981&r2=305982&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_standard.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_standard.sh Wed Jun 21 20:57:24 2017
@@ -28,7 +28,7 @@ MAKE_JOBS=${MAX_MAKE_JOBS:-8}
 CHECK_LIBCXX=${CHECK_LIBCXX:-1}
 CHECK_LLD=${CHECK_LLD:-1}
 
-LLVM_CHECKOUT=${ROOT}/llvm
+LLVM=${ROOT}/llvm
 CMAKE_COMMON_OPTIONS="-DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON"
 
 function build_tsan {
@@ -40,7 +40,7 @@ function build_tsan {
   fi
   (cd $build_dir && CC="$3" CXX="$4" cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
     ${CMAKE_COMMON_OPTIONS} ${extra_cmake_args} \
-    ${LLVM_CHECKOUT})
+    ${LLVM})
   (cd $build_dir && make -j$MAKE_JOBS ${targets}) || echo @@@STEP_FAILURE@@@
   (cd $build_dir && make compiler-rt-clear) || echo @@@STEP_FAILURE@@@
   (cd $build_dir && make -j$MAKE_JOBS tsan) || echo @@@STEP_FAILURE@@@
@@ -64,4 +64,4 @@ build_tsan "${TSAN_RELEASE_BUILD_DIR}" "
 echo @@@BUILD_STEP tsan analyze@@@
 BIN=$(mktemp -t tsan_exe.XXXXXXXX)
 echo "int main() {return 0;}" | $TSAN_RELEASE_BUILD_DIR/bin/clang -x c++ - -fsanitize=thread -O2 -o ${BIN}
-$LLVM_CHECKOUT/projects/compiler-rt/lib/tsan/check_analyze.sh ${BIN} || echo @@@STEP_FAILURE@@@
+$LLVM/projects/compiler-rt/lib/tsan/check_analyze.sh ${BIN} || echo @@@STEP_FAILURE@@@

More information about the llvm-commits mailing list