Author: jfrederic.clere(a)jboss.com Date: 2012-10-15 11:23:34 -0400 (Mon, 15 Oct 2012) New Revision: 2973 Modified: trunk/build/unix/buildbin.TC6.sh Log: Adjust native tests. Modified: trunk/build/unix/buildbin.TC6.sh =================================================================== --- trunk/build/unix/buildbin.TC6.sh 2012-10-15 14:06:32 UTC (rev 2972) +++ trunk/build/unix/buildbin.TC6.sh 2012-10-15 15:23:34 UTC (rev 2973) @@ -178,7 +178,7 @@ echo "Waiting for Tomcat to start" sleep 60 echo "" -grep http-apr $native_sources/output/build/logs/catalina.out +grep Http11AprProtocol $native_sources/output/build/logs/catalina.out if [ $? -ne 0 ]; then echo "Failed can't start native..." stopTomcat @@ -189,19 +189,11 @@ echo "SERVLETS" echo "" export TS_HOME=/home/hudson/tcks6/2.5/servlettck -export ANT_HOME=$TS_HOME/tools/ant -(cd $TS_HOME/bin; ant run.all || exit 1) +(cd $TS_HOME; bin/tsant runclient || 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 ""