Author: jfrederic.clere(a)jboss.com Date: 2014-04-29 10:32:49 -0400 (Tue, 29 Apr 2014) New Revision: 3271 Added: trunk/build/unix/buildbin.TC8.sh trunk/build/unix/buildsrc.TC8.sh trunk/build/unix/buildtest.TC8.sh Modified: trunk/build/unix/buildbin.TC7.sh trunk/build/unix/package.list Log: Add TC8 tests. Modified: trunk/build/unix/buildbin.TC7.sh =================================================================== --- trunk/build/unix/buildbin.TC7.sh 2014-04-29 06:24:59 UTC (rev 3270) +++ trunk/build/unix/buildbin.TC7.sh 2014-04-29 14:32:49 UTC (rev 3271) @@ -65,6 +65,12 @@ native_sources=srclib/`ls srclib | grep TC7` native_sources=`(cd $native_sources; pwd)` cd $native_sources +JAVA_7_HOME=$JAVA_HOME +JAVA_HOME=$JAVA6_HOME +echo "Using $JAVA_HOME for ant build-tomcat-dbcp" +ant build-tomcat-dbcp || exit 1 +JAVA_HOME=$JAVA_7_HOME +echo "Using $JAVA_HOME for ant" ant || exit 1 echo "" Added: trunk/build/unix/buildbin.TC8.sh =================================================================== --- trunk/build/unix/buildbin.TC8.sh (rev 0) +++ trunk/build/unix/buildbin.TC8.sh 2014-04-29 14:32:49 UTC (rev 3271) @@ -0,0 +1,179 @@ +#!/bin/sh +# Copyright(c) 2010 Red Hat Middleware, LLC, +# and individual contributors as indicated by the @authors tag. +# See the copyright.txt in the distribution for a +# full listing of individual contributors. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library in the file COPYING.LIB; +# if not, write to the Free Software Foundation, Inc., +# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA +# +# @author Jean-Frederic Clere +# +echo "" +echo "Running : `basename $0` $LastChangedDate: 2009-07-09 18:37:49 +0200 (Thu, 09 Jul 2009) $" +echo "" +echo "Started : `date`" +echo "Common : $1" +echo "Prefix : $2" +echo "Output : $3" +echo "OpenSSL : $4" +echo "Static : $5" +echo "Sources : $6" +echo "" + + +# parameters +# $1: Location of the common libraries. +# $2: Destination location. +# $3: Location where to put the binaries. +# $4: Use OpenSSL. +# $5: Use static build. +# $6: Location of the sources. + +common_loc=$1 +prefix_loc=$2 +output_loc=$3 +has_openssl_loc=$4 +has_static_loc=$5 +sources_loc=$6 + +# Stop Tomcat +stopTomcat() +{ +(cd $native_sources/output/build; bin/shutdown.sh) +sleep 10 +PID=`ps -ef | grep $native_sources | grep java | awk ' { print $2 } '` +if [ x$PID != "x" ]; then + kill -15 $PID + sleep 10 +fi +} + +current_loc=`pwd` +native_sources=srclib/`ls srclib | grep TC8` +native_sources=`(cd $native_sources; pwd)` +cd $native_sources +JAVA_HOME=$JAVA_7_HOME +echo "Using $JAVA_HOME for ant" +ant || exit 1 + +echo "" +echo "Stopping tomcat (just in case)" +echo "" +stopTomcat + +echo "" +echo "Running ant tests" +ant test || exit 1 +echo "Ant test Done" +echo "" + +echo "" +echo "Stopping TC8" +echo "" +stopTomcat + +echo "" +echo "Testing with native" +echo "" +# find the native we need to download for the tests. +is64=false +java -version 2>&1 | grep 64 +if [ $? -eq 0 ]; then + is64=true +fi +OS=`uname -s` +# Something like https://hudson.qa.jboss.com/hudson/view/Native/job/JBossWebNative-linux-x... +case $OS in + Linux) + BASE=JBossWebNative-linux-x86_64 + ;; + Darwin) + BASE=JBossWebNative-macosx-x64 + ;; + *) + echo "Unknow OS: $OS" + exit 1 + ;; +esac +EXT=ssl.tar.gz +#VERNAT=2.0.10 +#PACKVER=jboss-native-${VERNAT}-dev +#TARBALL=https://hudson.qa.jboss.com/hudson/view/Native/job/${BASE}/lastSuccessfulBuild/artifact/jbossnative/build/unix/output/${PACKVER}-${BUILD_SYS}-${BUILD_CPU}-${EXT} + +VERNAT=2.0.12-dev +PACKVER=jboss-native-${VERNAT} +TARBALL=http://downloads.jboss.org/jbossnative/${VERNAT}.GA/${PACKVER}-${BUILD_SYS}-${BUILD_CPU}-${EXT} +(cd $native_sources/output/build + wget --no-check-certificate $TARBALL + fname=`basename $TARBALL` + case ${fname} in + *.tar.gz) + gunzip -c $fname | tar -xf - + ;; + *.zip) + unzip -q -o $fname + ;; + esac +) +sed "/@SSL_CONNECTOR@/r $HOME/tcks/conf/server.xml.apr" $HOME/tcks/conf/server.xml | sed "/@SSL_CONNECTOR@/d" > $native_sources/output/build/conf/server.xml +cat >> $native_sources/output/build/bin/setenv.sh << EOF +LD_LIBRARY_PATH=$native_sources/output/build/bin/native/ +export LD_LIBRARY_PATH +EOF + +# Starting tomcat... +rm -rf $native_sources/output/build/work +rm -rf $native_sources/output/build/logs +mkdir $native_sources/output/build/logs +(cd $native_sources/output/build; bin/startup.sh) +echo "" +echo "Waiting for Tomcat to start" +sleep 60 +echo "" +grep http-apr $native_sources/output/build/logs/catalina.out +if [ $? -ne 0 ]; then + echo "Failed can't start native..." + stopTomcat + exit 1 +fi + +echo "Running TCK tests..." +echo "SERVLETS" +echo "" +export TS_HOME=/home/hudson/tcks/servlet/servlettck +export ANT_HOME=$TS_HOME/tools/ant +(cd $TS_HOME/bin; ant run.all || exit 1) +if [ $? -ne 0 ]; then + echo "Failed test failed..." + stopTomcat + exit 1 +else + (cd $TS_HOME/bin; ant report || exit 1) + if [ $? -ne 0 ]; then + echo "Failed build test report failed..." + stopTomcat + exit 1 + fi +fi + +echo "" +echo "Stopping TC8" +echo "" +stopTomcat + +echo "Done" +echo "" +exit 0 Property changes on: trunk/build/unix/buildbin.TC8.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/build/unix/buildsrc.TC8.sh =================================================================== --- trunk/build/unix/buildsrc.TC8.sh (rev 0) +++ trunk/build/unix/buildsrc.TC8.sh 2014-04-29 14:32:49 UTC (rev 3271) @@ -0,0 +1,62 @@ +#!/bin/sh +# Copyright(c) 2010 Red Hat Middleware, LLC, +# and individual contributors as indicated by the @authors tag. +# See the copyright.txt in the distribution for a +# full listing of individual contributors. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library in the file COPYING.LIB; +# if not, write to the Free Software Foundation, Inc., +# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA +# +# @author Jean-Frederic Clere +# +echo "" +echo "Running : `basename $0` $LastChangedDate: 2009-10-27 08:23:43 +0100 (Tue, 27 Oct 2009) $" +echo "" +echo "Started : `date`" +echo "Tag : $1" +echo "Target : $2" +echo "" + +# parameters +# $1: The tag to use something like 2.2.6 or trunk +# $2: Directory where to put the sources. + +tag=$1 +dist=$2 + +# we need something like: +# http://anonsvn.jboss.org/repos/mod_cluster/trunk/ +case $tag in + trunk) + URLBASE=http://svn.apache.org/repos/asf/tomcat/trunk/ + ;; + *) + URLBASE=http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/${tag} + ;; +esac + +echo "$tag using $URLBASE" +(cd $package_src_dir/srclib +svn export ${URLBASE} TC8 +) +if [ $? -ne 0 ]; then + echo "svn co ${URLBASE} TC8 FAILED" + exit 1 +fi +if [ ! -d $package_src_dir/srclib/TC8 ]; then + echo "$package_src_dir/srclib/TC8 not found!" + echo "svn co ${URLBASE} TC8 FAILED" + exit 1 +fi Property changes on: trunk/build/unix/buildsrc.TC8.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/build/unix/buildtest.TC8.sh =================================================================== --- trunk/build/unix/buildtest.TC8.sh (rev 0) +++ trunk/build/unix/buildtest.TC8.sh 2014-04-29 14:32:49 UTC (rev 3271) @@ -0,0 +1,45 @@ +#!/bin/sh +# Copyright(c) 2010 Red Hat Middleware, LLC, +# and individual contributors as indicated by the @authors tag. +# See the copyright.txt in the distribution for a +# full listing of individual contributors. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library in the file COPYING.LIB; +# if not, write to the Free Software Foundation, Inc., +# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA +# +# @author Jean-Frederic Clere +# +# Run a test of the traffic_server. +# +# $1 : Base directory for the test. +# $2 : Directory where the package was built. +# $3 : Directory where downloaded packages are stored. +# $4 : Name or IP to use for the tests. +# $5 : Do the SSL stuff. + +base=$1 +root=$2 +build_cache_dir=$3 +IPLOCAL=$4 +loc_has_ssl=$5 + +echo "" +echo "Running : `basename $0` $LastChangedDate: 2009-10-29 08:26:17 +0100 (Thu, 29 Oct 2009) $" +echo "" + +echo "" +echo "SUCCESS : `basename $0` $LastChangedDate: 2009-10-29 08:26:17 +0100 (Thu, 29 Oct 2009) $" +echo "" +exit 0 Property changes on: trunk/build/unix/buildtest.TC8.sh ___________________________________________________________________ Added: svn:executable + * Modified: trunk/build/unix/package.list =================================================================== --- trunk/build/unix/package.list 2014-04-29 06:24:59 UTC (rev 3270) +++ trunk/build/unix/package.list 2014-04-29 14:32:49 UTC (rev 3271) @@ -71,5 +71,6 @@ mod_cluster|1.2.8.dev|2.2.21|ssl:v:0.9.8r|zlib:v:1.2.3|jk:v:1.2.39|iconv:v:1.11|expat:v:1.95.8|cluster:t:1.2.x mod_cluster|1.3.1.dev|2.4.7|apr:v:1.5.0|apu:v:1.5.3|api:v:1.2.1|ssl:v:0.9.8r|zlib:v:1.2.3|jk:v:1.2.39|iconv:v:1.14|expat:v:1.95.8|pcre:v:8.34|cluster:t:master traffic_server|TS_Trunk|trunk +TC8|TC8_Trunk|trunk TC7|TC7_Trunk|trunk TC6|TC6_Trunk|trunk