Author: jfrederic.clere(a)jboss.com
Date: 2014-05-07 09:32:17 -0400 (Wed, 07 May 2014)
New Revision: 3278
Modified:
trunk/build/unix/buildbin.EAP6.sh
trunk/build/unix/buildbin.TC7.sh
Log:
Arrange test TCK6 = servlet TCK7 = websocket :D
Modified: trunk/build/unix/buildbin.EAP6.sh
===================================================================
--- trunk/build/unix/buildbin.EAP6.sh 2014-05-07 12:53:30 UTC (rev 3277)
+++ trunk/build/unix/buildbin.EAP6.sh 2014-05-07 13:32:17 UTC (rev 3278)
@@ -84,11 +84,12 @@
rm -rf $EAP6/standalone/deployments/
mkdir $EAP6/standalone/deployments/
-#installing
-export TS_HOME=/home/hudson/TCK7/javaeetck
+#installing servlet
+export TS_HOME=/home/hudson/tcks/servlet/servlettck
export ANT_HOME=$TS_HOME/tools/ant
+cp $TS_HOME/bin/ts.jte.tc7 $TS_HOME/bin/ts.jte
+
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`
@@ -104,7 +105,6 @@
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`
@@ -128,17 +128,16 @@
sleep 60
echo ""
-echo "Running TCK tests..."
+echo "Running TCK6 tests..."
echo "SERVLETS"
echo ""
-cp $TS_HOME/bin/ts.jte.eap6 $TS_HOME/bin/ts.jte
-(cd $SRID; ant runclient || exit 1)
+(cd $TS_HOME/bin; ant run.all || exit 1)
if [ $? -ne 0 ]; then
echo "Failed test failed..."
stopEAP6
exit 1
else
- (cd $SRID; ant report || exit 1)
+ (cd $TS_HOME/bin; ant report || exit 1)
if [ $? -ne 0 ]; then
echo "Failed build test report failed..."
stopEAP6
@@ -146,8 +145,11 @@
fi
fi
-echo "WEBSOCKET"
+echo "WEBSOCKET TCK7"
echo ""
+export TS_HOME=/home/hudson/TCK7/javaeetck
+export ANT_HOME=$TS_HOME/tools/ant
+cp $TS_HOME/bin/ts.jte.eap6 $TS_HOME/bin/ts.jte
(cd $WRID; ant runclient || exit 1)
if [ $? -ne 0 ]; then
echo "Failed test failed..."
Modified: trunk/build/unix/buildbin.TC7.sh
===================================================================
--- trunk/build/unix/buildbin.TC7.sh 2014-05-07 12:53:30 UTC (rev 3277)
+++ trunk/build/unix/buildbin.TC7.sh 2014-05-07 13:32:17 UTC (rev 3278)
@@ -210,6 +210,7 @@
echo ""
export TS_HOME=/home/hudson/tcks/servlet/servlettck
export ANT_HOME=$TS_HOME/tools/ant
+cp $TS_HOME/bin/ts.jte.tc7 $TS_HOME/bin/ts.jte
(cd $TS_HOME/bin; ant run.all || exit 1)
if [ $? -ne 0 ]; then
echo "Failed test failed..."
Show replies by date