svn commit: r1572782 - in /subversion/trunk/tools/buildbot/slaves/svn-x64-centos: list-svn-deps.sh svnbuild.sh svncheck.sh svnclean.sh

[br...@apache.org]

Author: breser
Date: Thu Feb 27 23:26:34 2014
New Revision: 1572782

URL: http://svn.apache.org/r1572782
Log:
Update the svn-x64-centos scripts to match what's on the slave.

* tools/buildbot/slaves/svn-x64-centos/list-svn-deps.sh: New

* tools/buildbot/slaves/svn-x64-centos/svnbuild.sh: Update from slave.

* tools/buildbot/slaves/svn-x64-centos/svncheck.sh: Update from slave.

* tools/buildbot/slaves/svn-x64-centos/svnclean.sh: Update from slave.

Added:
    subversion/trunk/tools/buildbot/slaves/svn-x64-centos/list-svn-deps.sh   (with props)
Modified:
    subversion/trunk/tools/buildbot/slaves/svn-x64-centos/svnbuild.sh
    subversion/trunk/tools/buildbot/slaves/svn-x64-centos/svncheck.sh
    subversion/trunk/tools/buildbot/slaves/svn-x64-centos/svnclean.sh

Added: subversion/trunk/tools/buildbot/slaves/svn-x64-centos/list-svn-deps.sh
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/svn-x64-centos/list-svn-deps.sh?rev=1572782&view=auto
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/svn-x64-centos/list-svn-deps.sh (added)
+++ subversion/trunk/tools/buildbot/slaves/svn-x64-centos/list-svn-deps.sh Thu Feb 27 23:26:34 2014
@@ -0,0 +1,34 @@
+#!/bin/sh
+# List the versions of all of SVN's dependencies.
+# The output is suitable for putting in the buildbot slave's 'info/host'
+# file, after a general description of the slave machine.
+
+echo "=== SVN dependencies ==="
+DEPS="gcc apr apr-util apr-devel apr-util-devel httpd httpd-devel \
+   neon neon-devel python python-devel ruby ruby-devel"
+#yum -C list $DEPS
+rpm -q ${DEPS} | sort | uniq
+# The SQLite version is found by the name of the amalgamation directory,
+# which is found in the home dir.  It is also explicitly referenced in the
+# './configure' line in 'svnbuild.sh'.
+(cd && echo sqlite-3.*[0-9].*[0-9])
+echo
+
+echo "=== SVN test dependencies ==="
+#rpm -q pysqlite | sort | uniq
+echo
+
+JAVA_VER=`java -fullversion 2>&1`
+PY_VER=`python -V 2>&1`
+RUBY_VER=`ruby --version`
+PERL_VER=`perl -v | grep This`
+echo "=== interpreters / bindings ==="
+echo "Java:   $JAVA_VER"
+echo "Python: $PY_VER"
+echo "Ruby:   $RUBY_VER"
+echo "Perl:   $PERL_VER"
+echo
+
+echo "=== BuildBot version ==="
+buildbot --version
+echo

Propchange: subversion/trunk/tools/buildbot/slaves/svn-x64-centos/list-svn-deps.sh
------------------------------------------------------------------------------
    svn:executable = *

Modified: subversion/trunk/tools/buildbot/slaves/svn-x64-centos/svnbuild.sh
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/svn-x64-centos/svnbuild.sh?rev=1572782&r1=1572781&r2=1572782&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/svn-x64-centos/svnbuild.sh (original)
+++ subversion/trunk/tools/buildbot/slaves/svn-x64-centos/svnbuild.sh Thu Feb 27 23:26:34 2014
@@ -32,6 +32,8 @@ echo "========= configure"
 #            --with-junit=/usr/share/java/junit.jar
 #            --with-jdk=/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64 \
 #            --without-berkeley-db \
+#            --disable-shared \
+#CFLAGS='-fprofile-arcs -ftest-coverage' \
 ./configure --enable-javahl --enable-maintainer-mode \
             --with-neon=/usr \
             --with-serf=/usr/local \

Modified: subversion/trunk/tools/buildbot/slaves/svn-x64-centos/svncheck.sh
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/svn-x64-centos/svncheck.sh?rev=1572782&r1=1572781&r2=1572782&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/svn-x64-centos/svncheck.sh (original)
+++ subversion/trunk/tools/buildbot/slaves/svn-x64-centos/svncheck.sh Thu Feb 27 23:26:34 2014
@@ -35,10 +35,7 @@ test -e ../mount-ramdrive && ../mount-ra
 
 echo "========= make"
 case "$2" in
-  ""|ra_dav|ra_neon)
-    make davautocheck FS_TYPE=$1 HTTP_LIBRARY=neon CLEANUP=1 || exit $?
-    ;;
-  ra_serf)
+  ""|ra_serf)
     make davautocheck FS_TYPE=$1 HTTP_LIBRARY=serf CLEANUP=1 || exit $?
     ;;
   ra_svn)

Modified: subversion/trunk/tools/buildbot/slaves/svn-x64-centos/svnclean.sh
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/svn-x64-centos/svnclean.sh?rev=1572782&r1=1572781&r2=1572782&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/svn-x64-centos/svnclean.sh (original)
+++ subversion/trunk/tools/buildbot/slaves/svn-x64-centos/svnclean.sh Thu Feb 27 23:26:34 2014
@@ -27,6 +27,6 @@ echo "========= unmount RAM disc"
 test -e ../unmount-ramdrive && ../unmount-ramdrive
 
 echo "========= make extraclean"
-test -e Makefile && { make extraclean || exit $?; }
+test -e Makefile && (make extraclean || exit $?)
 
 exit 0