[zorg] r351900 - [jenkins] Move scripts to the SCRIPT_PATH

Adrian Prantl via llvm-commits llvm-commits at lists.llvm.org
Tue Jan 22 16:05:18 PST 2019 

Author: adrian
Date: Tue Jan 22 16:05:18 2019
New Revision: 351900

URL: http://llvm.org/viewvc/llvm-project?rev=351900&view=rev
Log:
[jenkins] Move scripts to the SCRIPT_PATH

Added:
    zorg/trunk/zorg/jenkins/lldb-cmake-matrix-stage1.sh
      - copied, changed from r351897, zorg/trunk/zorg/jenkins/jobs/jobs/lldb-cmake-matrix-stage1.sh
    zorg/trunk/zorg/jenkins/lldb-cmake-matrix-stage2.sh
      - copied, changed from r351897, zorg/trunk/zorg/jenkins/jobs/jobs/lldb-cmake-matrix-stage2.sh
Removed:
    zorg/trunk/zorg/jenkins/jobs/jobs/lldb-cmake-matrix-stage1.sh
    zorg/trunk/zorg/jenkins/jobs/jobs/lldb-cmake-matrix-stage2.sh
Modified:
    zorg/trunk/zorg/jenkins/jobs/jobs/lldb-cmake-matrix

Modified: zorg/trunk/zorg/jenkins/jobs/jobs/lldb-cmake-matrix
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/jenkins/jobs/jobs/lldb-cmake-matrix?rev=351900&r1=351899&r2=351900&view=diff
==============================================================================
--- zorg/trunk/zorg/jenkins/jobs/jobs/lldb-cmake-matrix (original)
+++ zorg/trunk/zorg/jenkins/jobs/jobs/lldb-cmake-matrix Tue Jan 22 16:05:18 2019
@@ -36,7 +36,7 @@ export
 python $SCRIPT_PATH/build.py fetch
 '''
                     sh '''
-bash ${SCRIPT_PATH}/jobs/jobs/lldb-cmake-matrix-stage1
+bash $SCRIPT_PATH/lldb-cmake-matrix-stage1
 '''
                 }
             }
@@ -58,7 +58,7 @@ bash ${SCRIPT_PATH}/jobs/jobs/lldb-cmake
                 timeout(activity: true, time: 30) {
                     sh '''
 export HISTORIC_COMPILER=clang-5.0.2
-bash ${SCRIPT_PATH}/jobs/jobs/lldb-cmake-matrix-stage2
+bash ${SCRIPT_PATH}/lldb-cmake-matrix-stage2
 '''
                     junit 'test-clang-5.0.2/results.xml'
                 }

Removed: zorg/trunk/zorg/jenkins/jobs/jobs/lldb-cmake-matrix-stage1.sh
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/jenkins/jobs/jobs/lldb-cmake-matrix-stage1.sh?rev=351899&view=auto
==============================================================================
--- zorg/trunk/zorg/jenkins/jobs/jobs/lldb-cmake-matrix-stage1.sh (original)
+++ zorg/trunk/zorg/jenkins/jobs/jobs/lldb-cmake-matrix-stage1.sh (removed)
@@ -1,97 +0,0 @@
-set -eux
-
-# Avoid the python in /usr/local/bin.
-PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/jbin
-
-if [ -z "WORKSPACE" ]; then
-    echo "WORKSPACE is not set."
-    exit 1
-fi
-
-SRC="$WORKSPACE"
-BUILD="$WORKSPACE/lldb-build"
-TEST="$WORKSPACE/test"
-RESULTS="$WORKSPACE/results"
-DEST="$RESULTS/lldb"
-
-LLVM_SRC="$SRC/llvm"
-LLDB_SRC="$SRC/llvm/tools/lldb"
-TESTCASES_DIR="$LLDB_SRC/test/testcases"
-LOGS_DIR="$TEST/logs"
-RESULTS_FILE="$TEST/results.xml"
-
-CC="$WORKSPACE/host-compiler/bin/clang"
-CXX="$WORKSPACE/host-compiler/bin/clang++"
-
-TOOLS="clang lldb"
-PROJECTS=""
-
-
-echo "@@@ Clean @@@"
-
-CLEAN_DIRS="$TEST $DEST $LOGS_DIR $RESULTS $BUILD/lldb-test-build.noindex"
-
-if [ "$CLEAN" = "true" ]; then
-  CLEAN_DIRS="$BUILD $CLEAN_DIRS"
-fi
-
-for dir in $CLEAN_DIRS; do
-  if [ -d $dir ]; then
-    rm -rf $dir
-  fi
-  mkdir -p $dir
-done
-
-MODULE_CACHE=$(xcrun clang -fmodules -x c - -o /dev/null '-###' 2>&1 | grep -Eo '\\-fmodules-cache-path=[^"]+' | cut -d'=' -f2)
-if [ -d $MODULE_CACHE ]; then
-  rm -rf $MODULE_CACHE
-fi
-rm -rf $BUILD/module.cache
-
-rm -f $WORKSPACE/*.tgz
-
-echo "@@@@@@"
-
-mkdir -p $BUILD
-cd $BUILD
-
-echo "@@@ Setup @@@"
-
-{ /usr/local/bin/lldbsign unlock; } 2>/dev/null
-
-echo "@@@@@@"
-
-set +x
-echo "@@@ Environment @@@"
-env | sort
-echo "@@@@@@"
-set -eux
-
-python $SCRIPT_PATH/build.py derive-lldb-cmake
-
-echo "@@@ CMake @@@"
-cmake $LLVM_SRC \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DLLVM_ENABLE_ASSERTIONS=On \
-    -DLLVM_ENABLE_MODULES=On \
-    -DLLVM_VERSION_PATCH=99 \
-    -DLLVM_TARGETS_TO_BUILD='X86' \
-    -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-    -DCMAKE_INSTALL_PREFIX="$DEST" \
-    -DLLDB_BUILD_FRAMEWORK=On \
-    -G Ninja
-echo "@@@@@@"
-
-echo "@@@ Compile @@@"
-ninja
-
-#python $SCRIPT_PATH/build.py --assertions \
-#    --cmake-type=Release \
-#   --cmake-flag="-DLLVM_TARGETS_TO_BUILD=X86" \
-#    lldb-cmake
-
-echo "@@@@@@"
-
-
-# Delete directories that would get deleted first thing by the next build anyway.
-rm -rf $BUILD/lldb-test-build.noindex $BUILD/module.cache

Removed: zorg/trunk/zorg/jenkins/jobs/jobs/lldb-cmake-matrix-stage2.sh
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/jenkins/jobs/jobs/lldb-cmake-matrix-stage2.sh?rev=351899&view=auto
==============================================================================
--- zorg/trunk/zorg/jenkins/jobs/jobs/lldb-cmake-matrix-stage2.sh (original)
+++ zorg/trunk/zorg/jenkins/jobs/jobs/lldb-cmake-matrix-stage2.sh (removed)
@@ -1,142 +0,0 @@
-set -eux
-
-# Avoid the python in /usr/local/bin.
-PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/jbin
-
-if [ -z "HISTORIC_COMPILER" ]; then
-    echo "HISTORIC_COMPILER is not set."
-    exit 1
-fi
-
-if [ -z "WORKSPACE" ]; then
-    echo "WORKSPACE is not set."
-    exit 1
-fi
-
-SRC="$WORKSPACE/src"
-BASE_BUILD="$WORKSPACE/lldb-build"
-BUILD="$WORKSPACE/lldb-build-${HISTORIC_COMPILER}"
-TEST="$WORKSPACE/test-${HISTORIC_COMPILER}"
-RESULTS="$WORKSPACE/results-${HISTORIC_COMPILER}"
-DEST="$RESULTS/lldb"
-
-LLVM_SRC="$SRC/llvm"
-LLDB_SRC="$SRC/llvm/tools/lldb"
-TESTCASES_DIR="$LLDB_SRC/test/testcases"
-LOGS_DIR="$TEST/logs"
-RESULTS_FILE="$TEST/results.xml"
-
-CC="$WORKSPACE/host-compiler/bin/clang"
-CXX="$WORKSPACE/host-compiler/bin/clang++"
-
-TOOLS="clang lldb"
-PROJECTS=""
-
-
-echo "@@@ Clean @@@"
-
-CLEAN_DIRS="$TEST $LOGS_DIR $RESULTS $BUILD/lldb-test-build.noindex"
-
-if [ "$CLEAN" = "true" ]; then
-  CLEAN_DIRS="$BUILD $CLEAN_DIRS"
-fi
-
-for dir in $CLEAN_DIRS; do
-  if [ -d $dir ]; then
-    rm -rf $dir
-  fi
-  mkdir -p $dir
-done
-
-MODULE_CACHE=$(xcrun clang -fmodules -x c - -o /dev/null '-###' 2>&1 | grep -Eo '\\-fmodules-cache-path=[^"]+' | cut -d'=' -f2)
-if [ -d $MODULE_CACHE ]; then
-  rm -rf $MODULE_CACHE
-fi
-rm -rf $BUILD/module.cache
-
-rm -f $WORKSPACE/*.tgz
-
-echo "@@@@@@"
-
-mkdir -p $BUILD
-cd $BUILD
-
-echo "@@@ Setup @@@"
-
-{ /usr/local/bin/lldbsign unlock; } 2>/dev/null
-
-echo "@@@@@@"
-
-echo "@@@ Building historical clangs @@@"
-function build_clang() {
-  CLANG_NAME=$1
-  mkdir -p history/$CLANG_NAME
-  cd history/$CLANG_NAME
-  SVN=/Applications/Xcode.bak/Contents/Developer/usr/bin/svn
-  $SVN upgrade $SRC/history/$CLANG_NAME
-  $SVN upgrade $SRC/history/$CLANG_NAME/tools/clang
-  $SVN upgrade $SRC/history/$CLANG_NAME/projects/libcxx
-  cmake $SRC/history/$CLANG_NAME \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DLLVM_ENABLE_ASSERTIONS=Off \
-    -DLLVM_ENABLE_MODULES=On \
-    -DLLVM_TARGETS_TO_BUILD='X86' \
-    -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-    -DCMAKE_INSTALL_PREFIX="$RESULTS/history/$CLANG_NAME" \
-    -G Ninja
-  ninja
-  cd ../..
-}
-
-build_clang $HISTORIC_COMPILER
-HISTORIC_CLANG=${BUILD}/history/${HISTORIC_COMPILER}/bin/clang
-
-echo "@@@@@@"
-
-set +x
-echo "@@@ Environment @@@"
-env | sort
-echo "@@@@@@"
-set -eux
-
-python $SCRIPT_PATH/build.py derive-lldb-cmake
-
-echo "@@@ CMake @@@"
-rsync -av --delete $BASE_BUILD/bin $BUILD/
-cmake $WORKSPACE/llvm \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DLLVM_ENABLE_ASSERTIONS=On \
-    -DLLVM_ENABLE_MODULES=On \
-    -DLLVM_VERSION_PATCH=99 \
-    -DLLVM_TARGETS_TO_BUILD='X86' \
-    -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-    -DCMAKE_INSTALL_PREFIX="$DEST" \
-    -G Ninja \
-    -DLLDB_TEST_C_COMPILER="${HISTORIC_CLANG}" \
-    -DLLDB_TEST_CXX_COMPILER="${HISTORIC_CLANG}++" \
-    -DLLDB_TEST_USER_ARGS="--framework;$BASE_BUILD/bin/LLDB.framework;--executable;$BASE_BUILD/bin/lldb;--skip-category;gmodules;--arch=x86_64;--build-dir;$BUILD;--session-file-format;fm;-s=$LOGS_DIR;--env;TERM=vt100;" \
-    -DLLVM_LIT_ARGS="--xunit-xml-output=$RESULTS_FILE -v"
-
-echo "@@@@@@"
-
-
-echo "@@@ Running tests @@@"
-set +e
-# FIXME: The LIT tests don't pick the right compiler yet.
-python $BUILD/bin/llvm-lit --xunit-xml-output=$RESULTS_FILE \
-    -v $WORKSPACE/llvm/tools/lldb/lit --filter=lldb-Suite
-EXIT_STATUS=$?
-set -e
-echo "@@@@@@"
-
-
-echo "@@@ Archiving Test Logs @@@"
-tar zcf "$RESULTS/test_logs.tgz" -C "${LOGS_DIR}" .
-
-if [ $EXIT_STATUS -ne 0 ]; then
-    echo "CHECK-LLDB Failed!\n"
-    exit 1
-fi
-
-# Delete directories that would get deleted first thing by the next build anyway.
-rm -rf $BUILD/lldb-test-build.noindex $BUILD/module.cache

Copied: zorg/trunk/zorg/jenkins/lldb-cmake-matrix-stage1.sh (from r351897, zorg/trunk/zorg/jenkins/jobs/jobs/lldb-cmake-matrix-stage1.sh)
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/jenkins/lldb-cmake-matrix-stage1.sh?p2=zorg/trunk/zorg/jenkins/lldb-cmake-matrix-stage1.sh&p1=zorg/trunk/zorg/jenkins/jobs/jobs/lldb-cmake-matrix-stage1.sh&r1=351897&r2=351900&rev=351900&view=diff
==============================================================================
    (empty)

Copied: zorg/trunk/zorg/jenkins/lldb-cmake-matrix-stage2.sh (from r351897, zorg/trunk/zorg/jenkins/jobs/jobs/lldb-cmake-matrix-stage2.sh)
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/jenkins/lldb-cmake-matrix-stage2.sh?p2=zorg/trunk/zorg/jenkins/lldb-cmake-matrix-stage2.sh&p1=zorg/trunk/zorg/jenkins/jobs/jobs/lldb-cmake-matrix-stage2.sh&r1=351897&r2=351900&rev=351900&view=diff
==============================================================================
    (empty)

More information about the llvm-commits mailing list