[zorg] r351982 - [jenkins] Add a LIT timeout.

[Adrian Prantl via llvm-commits]

Author: adrian
Date: Wed Jan 23 13:33:36 2019
New Revision: 351982

URL: http://llvm.org/viewvc/llvm-project?rev=351982&view=rev
Log:
[jenkins] Add a LIT timeout.

Modified:
    zorg/trunk/zorg/jenkins/jobs/jobs/lldb-cmake-matrix
    zorg/trunk/zorg/jenkins/lldb-cmake-matrix-dwarf5.sh
    zorg/trunk/zorg/jenkins/lldb-cmake-matrix-stage2.sh

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=351982&r1=351981&r2=351982&view=diff
==============================================================================
--- zorg/trunk/zorg/jenkins/jobs/jobs/lldb-cmake-matrix (original)
+++ zorg/trunk/zorg/jenkins/jobs/jobs/lldb-cmake-matrix Wed Jan 23 13:33:36 2019
@@ -22,7 +22,7 @@ pipeline {
                 }
             }
         }
-        stage('Build') {
+        stage('Build LLDB') {
             steps {
                 timeout(activity: true, time: 30) {
                     sh '''
@@ -41,7 +41,7 @@ bash $SCRIPT_PATH/lldb-cmake-matrix-stag
                 }
             }
         }
-        stage('LLDB CMake Matrix Stage 2, Clang 5.0.2') {
+        stage('Test against Clang 5.0.2') {
             steps {
                 timeout(activity: true, time: 30) {
                     checkout([$class: 'SubversionSCM',
@@ -64,7 +64,7 @@ bash ${SCRIPT_PATH}/lldb-cmake-matrix-st
                 }
             }
         }
-        stage('LLDB CMake Matrix Stage 2, Clang 6.0.1') {
+        stage('Test against Clang 6.0.1') {
             steps {
                 timeout(activity: true, time: 30) {
                     checkout([$class: 'SubversionSCM',
@@ -87,7 +87,7 @@ bash ${SCRIPT_PATH}/lldb-cmake-matrix-st
                 }
             }
         }
-        stage('LLDB CMake Matrix Stage 2, Clang 7.0.1') {
+        stage('Run tests against Clang 7.0.1') {
             steps {
                 timeout(activity: true, time: 30) {
                     checkout([$class: 'SubversionSCM',
@@ -110,7 +110,7 @@ bash ${SCRIPT_PATH}/lldb-cmake-matrix-st
                 }
             }
         }
-        stage('LLDB CMake Matrix Stage 2, Upstream Clang + DWARF 5') {
+        stage('Test against Upstream Clang + DWARF 5') {
             steps {
                 timeout(activity: true, time: 30) {
                     sh '''

Modified: zorg/trunk/zorg/jenkins/lldb-cmake-matrix-dwarf5.sh
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/jenkins/lldb-cmake-matrix-dwarf5.sh?rev=351982&r1=351981&r2=351982&view=diff
==============================================================================
--- zorg/trunk/zorg/jenkins/lldb-cmake-matrix-dwarf5.sh (original)
+++ zorg/trunk/zorg/jenkins/lldb-cmake-matrix-dwarf5.sh Wed Jan 23 13:33:36 2019
@@ -2,6 +2,7 @@ set -eux
 
 # Avoid the python in /usr/local/bin.
 PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/jbin
+PYTHONPATH=/usr/local/lib/python2.7/site-packages
 
 if [ -z "WORKSPACE" ]; then
     echo "WORKSPACE is not set."
@@ -63,7 +64,7 @@ echo "@@@ Setup @@@"
 echo "@@@@@@"
 
 set +x
-echo "@@@ Environment @@@"
+echo "@@@ Environment for DWARF 5 @@@"
 env | sort
 echo "@@@@@@"
 set -eux
@@ -101,7 +102,7 @@ echo "@@@ Running tests using DWARF 5 @@
 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
+    -v $WORKSPACE/llvm/tools/lldb/lit --filter=lldb-Suite --timeout 30
 EXIT_STATUS=$?
 set -e
 echo "@@@@@@"

Modified: zorg/trunk/zorg/jenkins/lldb-cmake-matrix-stage2.sh
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/jenkins/lldb-cmake-matrix-stage2.sh?rev=351982&r1=351981&r2=351982&view=diff
==============================================================================
--- zorg/trunk/zorg/jenkins/lldb-cmake-matrix-stage2.sh (original)
+++ zorg/trunk/zorg/jenkins/lldb-cmake-matrix-stage2.sh Wed Jan 23 13:33:36 2019
@@ -2,6 +2,7 @@ set -eux
 
 # Avoid the python in /usr/local/bin.
 PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/jbin
+PYTHONPATH=/usr/local/lib/python2.7/site-packages
 
 if [ -z "HISTORIC_COMPILER" ]; then
     echo "HISTORIC_COMPILER is not set."
@@ -94,7 +95,7 @@ HISTORIC_CLANG=${BUILD}/history/${HISTOR
 echo "@@@@@@"
 
 set +x
-echo "@@@ Environment @@@"
+echo "@@@ Environment for ${HISTORIC_COMPILER} @@@"
 env | sort
 echo "@@@@@@"
 set -eux
@@ -124,7 +125,7 @@ echo "@@@ Running tests using ${HISTORIC
 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
+    -v $WORKSPACE/llvm/tools/lldb/lit --filter=lldb-Suite --timeout 30
 EXIT_STATUS=$?
 set -e
 echo "@@@@@@"