[Xquartz-changes] [527] tinderbox/tinderbox_test.sh

[source_changes at macosforge.org]

Revision: 527
          http://trac.macosforge.org/projects/xquartz/changeset/527
Author:   jeremyhu at freedesktop.org
Date:     2011-04-09 00:30:21 -0700 (Sat, 09 Apr 2011)
Log Message:
-----------
Use python2 on tifa-linux64

Modified Paths:
--------------
    tinderbox/tinderbox_test.sh

Modified: tinderbox/tinderbox_test.sh
===================================================================
--- tinderbox/tinderbox_test.sh	2011-04-09 07:12:55 UTC (rev 526)
+++ tinderbox/tinderbox_test.sh	2011-04-09 07:30:21 UTC (rev 527)
@@ -3,7 +3,7 @@
 # Visit http://tinderbox.x.org/account/ to add more machines.
 
 if [[ $# -eq 0 ]] ; then
-  CONFIG="$(hostname -s)"
+  CONFIG="$(hostname -s)${SCHROOT_SESSION_ID+"-${SCHROOT_SESSION_ID}"}"
 else
   CONFIG=$1
 fi
@@ -30,6 +30,8 @@
     URL="http://jeremyhu-tifa-linux32:xFDSPr@tinderbox.x.org/builds/rpc"
     ;;
   tifa-linux64)
+    # libxcb does not like python3
+    export PYTHON="/usr/bin/python2"
     URL="http://jeremyhu-tifa-linux64:JsFKEr4f6@tinderbox.x.org/builds/rpc"
     ;;
   *)
@@ -44,6 +46,7 @@
 [[ -d /opt/local/bin ]] && PATH="/opt/local/bin:${PATH}"
 [[ -d /opt/llvm/bin ]] && PATH="/opt/llvm/bin:${PATH}"
 [[ -d "${HOME}/bin" ]] && PATH="${HOME}/bin:${PATH}"
+PATH="${JHBUILDDIR}/build/bin:${JHBUILDDIR}/external/build/bin:${PATH}"
 
 export ACLOCAL="aclocal -I ${JHBUILDDIR}/build/share/aclocal"
 [[ -d /usr/local/share/aclocal ]] && ACLOCAL="${ACLOCAL} -I /usr/local/share/aclocal"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/xquartz-changes/attachments/20110409/4b928131/attachment-0001.html>