[zorg] r351984 - [jenkins] Set PYTHONPATH with more emphasis.

[Adrian Prantl via llvm-commits]

Author: adrian
Date: Wed Jan 23 13:46:14 2019
New Revision: 351984

URL: http://llvm.org/viewvc/llvm-project?rev=351984&view=rev
Log:
[jenkins] Set PYTHONPATH with more emphasis.

Modified:
    zorg/trunk/zorg/jenkins/lldb-cmake-matrix-dwarf5.sh
    zorg/trunk/zorg/jenkins/lldb-cmake-matrix-stage2.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=351984&r1=351983&r2=351984&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:46:14 2019
@@ -2,7 +2,6 @@ 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."
@@ -101,8 +100,9 @@ echo "@@@@@@"
 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 --timeout 30
+env PYTHONPATH=/usr/local/lib/python2.7/site-packages \
+    python $BUILD/bin/llvm-lit --xunit-xml-output=$RESULTS_FILE \
+        -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=351984&r1=351983&r2=351984&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:46:14 2019
@@ -2,7 +2,6 @@ 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."
@@ -124,8 +123,9 @@ echo "@@@@@@"
 echo "@@@ Running tests using ${HISTORIC_COMPILER} @@@"
 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 --timeout 30
+env PYTHONPATH=/usr/local/lib/python2.7/site-packages \
+    python $BUILD/bin/llvm-lit --xunit-xml-output=$RESULTS_FILE \
+        -v $WORKSPACE/llvm/tools/lldb/lit --filter=lldb-Suite --timeout 30
 EXIT_STATUS=$?
 set -e
 echo "@@@@@@"