[jbossnative-commits] JBoss Native SVN: r3277 - trunk/build/unix.
Author: jfrederic.clere(a)jboss.com
Date: 2014-05-07 08:53:30 -0400 (Wed, 07 May 2014)
New Revision: 3277
Modified:
trunk/build/unix/buildbin.EAP6.sh
trunk/build/unix/buildbin.TC8.sh
Log:
test websocket and servlet.
Modified: trunk/build/unix/buildbin.EAP6.sh
===================================================================
--- trunk/build/unix/buildbin.EAP6.sh 2014-05-07 12:09:26 UTC (rev 3276)
+++ trunk/build/unix/buildbin.EAP6.sh 2014-05-07 12:53:30 UTC (rev 3277)
@@ -72,6 +72,8 @@
EAP6=/home/hudson/EAP6
export EAP6
old_file=`ls $EAP6/odules/system/layers/base/org/jboss/as/web/main/jbossweb*.jar`
+cp $jar_file $old_file
+cp $jar_file $EAP6/jbossweb.jar
echo ""
echo "Stopping EAP6 (just in case)"
@@ -85,9 +87,9 @@
#installing
export TS_HOME=/home/hudson/TCK7/javaeetck
export ANT_HOME=$TS_HOME/tools/ant
-DIR=$TS_HOME/dist/com/sun/ts/tests/servlet
-RID=$TS_HOME/src/com/sun/ts/tests/servlet
-for file in `find $DIR -name *.war`
+SDIR=$TS_HOME/dist/com/sun/ts/tests/servlet
+SRID=$TS_HOME/src/com/sun/ts/tests/servlet
+for file in `find $SDIR -name *.war`
do
FILE=`basename $file`
rm -rf TMP
@@ -99,12 +101,28 @@
cp $FILE $EAP6/standalone/deployments/
cd -
done
+
+
+WDIR=$TS_HOME/dist/com/sun/ts/tests/websocket
+WRID=$TS_HOME/src/com/sun/ts/tests/websocket
+for file in `find $WDIR -name *.war`
+do
+ FILE=`basename $file`
+ rm -rf TMP
+ mkdir TMP
+ cd TMP
+ jar xvf $file
+ rm META-INF/MANIFEST.MF
+ jar cvf $FILE *
+ cp $FILE $EAP6/standalone/deployments/
+ cd -
+done
#configurating
JAVA_OPTS="$JAVA_OPTS -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true
-Dorg.apache.tomcat.util.http.ServerCookie.FWD_SLASH_IS_SEPARATOR=false"
export JAVA_OPTS
# Starting tomcat...
-(cd $EAP6; bin/standalone.shi &)
+(cd $EAP6; bin/standalone.sh &)
echo ""
echo "Waiting for EAP6 to start"
sleep 60
@@ -113,13 +131,14 @@
echo "Running TCK tests..."
echo "SERVLETS"
echo ""
-(cd $RID; ant runclient || exit 1)
+cp $TS_HOME/bin/ts.jte.eap6 $TS_HOME/bin/ts.jte
+(cd $SRID; ant runclient || exit 1)
if [ $? -ne 0 ]; then
echo "Failed test failed..."
stopEAP6
exit 1
else
- (cd $RID; ant report || exit 1)
+ (cd $SRID; ant report || exit 1)
if [ $? -ne 0 ]; then
echo "Failed build test report failed..."
stopEAP6
@@ -127,9 +146,25 @@
fi
fi
+echo "WEBSOCKET"
echo ""
-echo "Stopping TC8"
+(cd $WRID; ant runclient || exit 1)
+if [ $? -ne 0 ]; then
+ echo "Failed test failed..."
+ stopEAP6
+ exit 1
+else
+ (cd $WRID; ant report || exit 1)
+ if [ $? -ne 0 ]; then
+ echo "Failed build test report failed..."
+ stopEAP6
+ exit 1
+ fi
+fi
+
echo ""
+echo "Stopping EAP6"
+echo ""
stopEAP6
echo "Done"
Modified: trunk/build/unix/buildbin.TC8.sh
===================================================================
--- trunk/build/unix/buildbin.TC8.sh 2014-05-07 12:09:26 UTC (rev 3276)
+++ trunk/build/unix/buildbin.TC8.sh 2014-05-07 12:53:30 UTC (rev 3277)
@@ -64,6 +64,7 @@
current_loc=`pwd`
native_sources=srclib/`ls srclib | grep TC8`
native_sources=`(cd $native_sources; pwd)`
+export native_sources
cd $native_sources
echo "Using $JAVA_HOME for ant"
ant || exit 1
@@ -119,6 +120,7 @@
echo "Running TCK tests..."
echo "SERVLETS"
echo ""
+cp $TS_HOME/bin/ts.jte.tc8 $TS_HOME/bin/ts.jte
(cd $RID; ant runclient || exit 1)
if [ $? -ne 0 ]; then
echo "Failed test failed..."