axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject cvs commit: ws-axis/c/tests/auto_build/testcases/platform/linux buildTestCase.sh runTestCase.sh setAxis.sh
Date Thu, 07 Oct 2004 12:41:22 GMT
damitha     2004/10/07 05:41:22

  Modified:    c/tests/auto_build autoBuildCVS.sh build.sh runAllTests.sh
               c/tests/auto_build/testcases/platform/linux buildTestCase.sh
                        runTestCase.sh setAxis.sh
  Log:
  As Samisa suggested used g++ to build directly. This actually increased the
  test run speed.
  
  Revision  Changes    Path
  1.20      +21 -26    ws-axis/c/tests/auto_build/autoBuildCVS.sh
  
  Index: autoBuildCVS.sh
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/tests/auto_build/autoBuildCVS.sh,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- autoBuildCVS.sh	30 Sep 2004 13:07:10 -0000	1.19
  +++ autoBuildCVS.sh	7 Oct 2004 12:41:21 -0000	1.20
  @@ -17,13 +17,13 @@
   
   #Setting environment variables. User may change the default values to fit his own environment
   
  -XERCESC_HOME=${XERCESC_HOME:-/usr/local/xerces-c-src2_2_0}
  +XERCESC_HOME=${XERCESC_HOME:-/usr/local/xerces-c}
   EXPAT_HOME=${EXPAT_HOME:-/usr/local/expat1957}
   APACHE2_HOME=${APACHE2_HOME:-/usr/local/apache2}
   APACHE_HOME=${APACHE_HOME:-/usr/local/apache}
   AXISCPP_HOME=${HOME_DIR}/${CHECKOUT_DIR}
   AXISCPP_DEPLOY=${AXISCPP_DEPLOY:-/usr/local/axiscpp_deploy}
  -LD_LIBRARY_PATH=${AXISCPP_DEPLOY}/lib 
  +LD_LIBRARY_PATH=${XERCESC_HOME}/lib:${EXPAT_HOME}/lib:${AXISCPP_DEPLOY}/lib 
   PATH="/usr/bin:/usr/local/bin:$PATH"
   export LD_LIBRARY_PATH AXISCPP_DEPLOY XERCESC_HOME EXPAT_HOME APACHE2_HOME APACHE_HOME
AXISCPP_HOME PATH
   
  @@ -44,7 +44,6 @@
   cd ${HOME_DIR}
   echo "" > testcases/build/buildTestCase.log
   echo "" > testcases/build/runTestCase.log
  -echo "came"
   # *** Get the update from CVS ***
   echo Getting CVS Update from ${CVSROOT}
   cd ${HOME_DIR}
  @@ -91,9 +90,6 @@
   else
       echo Source Build/Install Failed
       echo `date` Source Build/Install Failed >> ${LOG}
  -    if test -f $HOME_DIR/mailto; then
  -        cat $HOME_DIR/log_source_build_messages $HOME_DIR/log_source_install_messages $HOME_DIR/log
| mutt -s "[test-results]Axis C++ Autobuild and regression test" -a "$HOME_DIR/log_source_build_errors"
-a "$HOME_DIR/log_source_install_errors" -x axis-c-dev@ws.apache.org
  -    fi
       exit
   fi
   
  @@ -102,20 +98,20 @@
   echo "	Build messages 			:${SOURCE_BUILD_MESSAGES}"
   echo "	Build errors/warnings 		:${SOURCE_BUILD_ERRORS}"
   
  +cd ${HOME_DIR}
   
  -APACHE2_PORT=$(echo | grep APACHE2_PORT testcases/platform/linux/apache_ports.config |
grep -o "[0-9]*$")
  -APACHE_PORT=$(echo | grep APACHE_PORT testcases/platform/linux/apache_ports.config | grep
-o "[0-9]*$")
  -APACHE2_HOST=$(echo | grep APACHE2_HOST testcases/platform/linux/apache_ports.config |
grep -o "=.*$"|sed "s/=//g")
  -APACHE_HOST=$(echo | grep APACHE_HOST testcases/platform/linux/apache_ports.config | grep
-o "=.*$"|sed "s/=//g")
  -ls testcases/wsdls/*.wsdl | sed "s/testcases\/wsdls\///g" |sed "s/.wsdl/:host=localhost/g"
> ${HOME_DIR}/testcases/platform/linux/test.config
  -ls testcases/wsdls/*.wsdl | sed "s/testcases\/wsdls\///g" |sed "s/.wsdl/:port=80/g" >>
${HOME_DIR}/testcases/platform/linux/test.config
  +APACHE2_PORT=$(echo | grep APACHE2_PORT ${HOME_DIR}/testcases/platform/linux/apache_ports.config
| grep -o "[0-9]*$")
  +APACHE_PORT=$(echo | grep APACHE_PORT ${HOME_DIR}/testcases/platform/linux/apache_ports.config
| grep -o "[0-9]*$")
  +APACHE2_HOST=$(echo | grep APACHE2_HOST ${HOME_DIR}/testcases/platform/linux/apache_ports.config
| grep -o "=.*$"|sed "s/=//g")
  +APACHE_HOST=$(echo | grep APACHE_HOST ${HOME_DIR}/testcases/platform/linux/apache_ports.config
| grep -o "=.*$"|sed "s/=//g")
  +ls ${HOME_DIR}/testcases/wsdls/*.wsdl | sed "s/testcases\/wsdls\///g" |sed "s/.wsdl/:host=localhost/g"
> ${HOME_DIR}/testcases/platform/linux/test.config
  +ls ${HOME_DIR}/testcases/wsdls/*.wsdl | sed "s/testcases\/wsdls\///g" |sed "s/.wsdl/:port=80/g"
>> ${HOME_DIR}/testcases/platform/linux/test.config
   # *** Deploy with Apache 2 ***
  -echo Start deploy with apache2 using expat parser library
  -sed 's/xercesc/expat/g' ${AXISCPP_DEPLOY}/bin/deploy_apache2.sh > ${AXISCPP_DEPLOY}/bin/deploy_apache2_auto.sh
  -sed "s/[port=][0-9]*$/port=${APACHE2_PORT}/g" ${HOME_DIR}/testcases/platform/linux/test.config>
./test.config
  -sed "s/host=.*$/host=${APACHE2_HOST}/g" testcases/platform/linux/test.config> ./test.config
  -#sed 's/9090/80/g' testcases/platform/linux/test.config > ./test.config
  -cp -f test.config testcases/platform/linux
  +echo Start deploy with apache2 using xerces-c parser library
  +sed 's/expat/xercesc/g' ${AXISCPP_DEPLOY}/bin/deploy_apache2.sh > ${AXISCPP_DEPLOY}/bin/deploy_apache2_auto.sh
  +sed "s/host=.*$/host=${APACHE2_HOST}/g" ${HOME_DIR}/testcases/platform/linux/test.config>
${HOME_DIR}/test.config_temp
  +sed "s/port=[0-9]*$/port=${APACHE2_PORT}/g" ${HOME_DIR}/test.config_temp> ${HOME_DIR}/test.config
  +cp -f ${HOME_DIR}/test.config ${HOME_DIR}/testcases/platform/linux
   cp -f ${AXISCPP_DEPLOY}/lib/libaxiscpp_mod2.so ${APACHE2_HOME}/modules/
   sh ${AXISCPP_DEPLOY}/bin/deploy_apache2_auto.sh
   
  @@ -130,16 +126,15 @@
   fi
   
   echo "running the tests"
  -sh ./runAllTests.sh
  +. ${HOME_DIR}/runAllTests.sh
   
   # *** Deploy with Apache 1 ***
   
  -echo "Start deploy with apache1 using expat parser library"
  -sed 's/xercesc/expat/g' ${AXISCPP_DEPLOY}/bin/deploy_apache.sh > ${AXISCPP_DEPLOY}/bin/deploy_apache_auto.sh
  -sed "s/[port=][0-9]*$/port=${APACHE_PORT}/g" ${HOME_DIR}/testcases/platform/linux/test.config>
./test.config
  -sed "s/host=.*$/host=${APACHE_HOST}/g" testcases/platform/linux/test.config> ./test.config
  -#sed 's/80/9090/g' ${HOME_DIR}/testcases/platform/linux/test.config > ./test.config
  -cp -f test.config ${HOME_DIR}/testcases/platform/linux
  +echo "Start deploy with apache1 using xerces-c parser library"
  +sed 's/expat/xercesc/g' ${AXISCPP_DEPLOY}/bin/deploy_apache.sh > ${AXISCPP_DEPLOY}/bin/deploy_apache_auto.sh
  +sed "s/host=.*$/host=${APACHE_HOST}/g" ${HOME_DIR}/testcases/platform/linux/test.config>
${HOME_DIR}/test.config_temp
  +sed "s/port=[0-9]*$/port=${APACHE_PORT}/g" ${HOME_DIR}/test.config_temp> ${HOME_DIR}/test.config
  +cp -f ${HOME_DIR}/test.config ${HOME_DIR}/testcases/platform/linux
   cp -f ${AXISCPP_DEPLOY}/lib/libaxiscpp_mod.so ${APACHE_HOME}/libexec/
   sh ${AXISCPP_DEPLOY}/bin/deploy_apache_auto.sh
   
  @@ -154,7 +149,7 @@
   fi
   
   echo "running the tests"
  -sh ./runAllTests.sh
  +. ${HOME_DIR}/runAllTests.sh
   
   #Only if there is a file called mailto in the current folder, do the step.
   #If you need to mail results create a file called mailto in the current
  
  
  
  1.2       +1 -1      ws-axis/c/tests/auto_build/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/tests/auto_build/build.sh,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.sh	31 Aug 2004 10:19:55 -0000	1.1
  +++ build.sh	7 Oct 2004 12:41:21 -0000	1.2
  @@ -26,7 +26,7 @@
       --with-apache2=/usr/local/apache2 \
       --with-apache=/usr/local/apache \
       --with-expat=/usr/local/expat1957 \
  -    --with-xercesc=/usr/local/xerces-c-src2_2_0 \
  +    --with-xercesc=/usr/local/xerces-c \
       --enable-libwww=no
   echo "make"
   make 2> build_errors
  
  
  
  1.6       +13 -8     ws-axis/c/tests/auto_build/runAllTests.sh
  
  Index: runAllTests.sh
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/tests/auto_build/runAllTests.sh,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- runAllTests.sh	10 Sep 2004 07:05:09 -0000	1.5
  +++ runAllTests.sh	7 Oct 2004 12:41:21 -0000	1.6
  @@ -12,6 +12,12 @@
   	echo -e "Environment variable AXISCPP_HOME is not set. A default will be used"
       unset=1
   fi
  +
  +if [[ -z "$HOME_DIR" ]]
  +then
  +HOME_DIR=$PWD
  +export HOME_DIR
  +fi
   #if [[ -z "$AXISTEST_HOME" ]]
   #then
   #	echo -e "Environment variable AXISTEST_HOME is not set. A default will be used"
  @@ -28,13 +34,12 @@
   	esac
   fi
   
  -. testcases/platform/linux/setAxis.sh 
  +. ${HOME_DIR}/testcases/platform/linux/setAxis.sh 
   
   #rm -rf $OUTPUT_DIR
  -
   passed=0
   num_tests=0
  -for X in testcases/wsdls/*.wsdl
  +for X in ${TEST_HOME}/testcases/wsdls/*.wsdl
   do
   runTestCase.sh "$X" c++
   [[ $? -eq 0 ]] && passed=$(($passed + 1))
  @@ -45,9 +50,9 @@
   echo -n "${passed}/${num_tests} tests passed."
   [[ $passed -eq $num_tests ]] && echo " PASSED" || echo " FAILED"
   
  -exit 0
  +#exit 0
   
  -for file in $(find client -name "*.c" -o -name "*.cpp")
  -do
  - runTestCase.sh $(echo testcases/wsdls/$(basename $file) | sed "s/Client\./.wsdl /" | sed
"s/pp/++/")
  -done
  +#for file in $(find client -name "*.c" -o -name "*.cpp")
  +#do
  +# runTestCase.sh $(echo testcases/wsdls/$(basename $file) | sed "s/Client\./.wsdl /" |
sed "s/pp/++/")
  +#done
  
  
  
  1.8       +16 -0     ws-axis/c/tests/auto_build/testcases/platform/linux/buildTestCase.sh
  
  Index: buildTestCase.sh
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/platform/linux/buildTestCase.sh,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- buildTestCase.sh	6 Oct 2004 07:59:03 -0000	1.7
  +++ buildTestCase.sh	7 Oct 2004 12:41:22 -0000	1.8
  @@ -12,7 +12,22 @@
   SERVICE_FILE_NAME=$(echo | grep portType $1|grep -o '".*"'|sed "s/\"//g").$2
   SERVER=$(echo testcases/server/$2/${SERVICE_FILE_NAME})
   LIB_SERVICE_NAME=$(echo | grep portType $1|grep -o '".*"'|sed "s/\"//g")
  +STYLE=$(echo | grep style $1 | grep -o 'style=".*"' | grep -o '".*"' | sed "s/\"//g")
  +#sed -e "s/service_name/${LIB_SERVICE_NAME}/g" -e "s/service_lib_name/${LIB_SERVICE_NAME}/g"
-e "s/STYLE/${STYLE}/g" service_temp.wsdd > service.wsdd
   java -cp ${WSDL2WS_HOME}/wsdl2ws.jar:${AXIS_JARS} org.apache.axis.wsdl.wsdl2ws.WSDL2Ws
-sserver -l$2 -o$TARGET_SERVER $1
  +sed -e "s/<?xml.*>//g" -e "s/<\/deployment>//g" -e "s/<deployment.*>//g"
$TARGET_SERVER/deploy.wsdd > deploy.wsdd
  +if ! test -f server.wsdd_temp2; then
  +cat server.wsdd_temp > server.wsdd_temp2
  +fi
  +grep "${LIB_SERVICE_NAME}" server.wsdd_temp2
  +if [ $? -eq 0 ]
  +then
  +echo "Service already listed in the server.wsdd"
  +else
  +cat deploy.wsdd >> server.wsdd_temp2
  +fi
  +sed -e "s/<\/deployment>//g" server.wsdd_temp2 > server.wsdd
  +echo "</deployment>" >> server.wsdd
   
   if [ $? -eq 0 ]
   then
  @@ -20,6 +35,7 @@
     cd $TARGET_SERVER
     g++ -shared -I$AXISCPP_HOME/include -olibservice.so *.cpp
     cp -f libservice.so $AXISCPP_DEPLOY/lib/lib${LIB_SERVICE_NAME}.so
  +  cp -f server.wsdd $AXISCPP_DEPLOY/etc/
     ${APACHE2_HOME}/bin/apachectl restart
     ${APACHE_HOME}/bin/apachectl restart
   else
  
  
  
  1.6       +1 -1      ws-axis/c/tests/auto_build/testcases/platform/linux/runTestCase.sh
  
  Index: runTestCase.sh
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/platform/linux/runTestCase.sh,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- runTestCase.sh	27 Sep 2004 07:34:28 -0000	1.5
  +++ runTestCase.sh	7 Oct 2004 12:41:22 -0000	1.6
  @@ -59,7 +59,7 @@
   else
     TIME=$(date "+%d/%m/%Y %H:%M:%S")
     echo "${TIME}: Regression test on $TARGET: BUILD SUCCESS" |tee -a $OUTPUT_DIR/buildTestCase.log
  -  export LD_LIBRARY_PATH=$AXISCPP_HOME_BIN:$LIB_XERCES_BIN
  +  export LD_LIBRARY_PATH=$AXISCPP_HOME_BIN:$LIB_XERCES_BIN:$LD_LIBRARY_PATH
   
     # Pass in the URI if it has been set.
     $OUTPUT_DIR/$TARGET/client $URI > $OUTPUT_DIR/$TARGET/$OUTPUT
  
  
  
  1.8       +2 -3      ws-axis/c/tests/auto_build/testcases/platform/linux/setAxis.sh
  
  Index: setAxis.sh
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/platform/linux/setAxis.sh,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- setAxis.sh	6 Oct 2004 04:43:12 -0000	1.7
  +++ setAxis.sh	7 Oct 2004 12:41:22 -0000	1.8
  @@ -12,7 +12,6 @@
   script_location=$(dirname $0)
   cd $script_location
   TEST_HOME=$PWD
  -
   #
   # These variables can be overridden by setting the variables in the
   # calling shell. It'll use the variable if set otherwise it'll use
  @@ -54,13 +53,13 @@
   # is in the PATH too
   PATH="$ANT_HOME/bin:$JAVA_HOME/bin:$AXISCPP_TEST_BIN:$PATH"
   
  -LD_LIBRARY_PATH=$XERCESC_HOME/lib:$EXPAT_HOME/lib:$LD_LIBRARY_PATH
  +LD_LIBRARY_PATH=$AXISCPP_DEPLOY/lib:$XERCESC_HOME/lib:$EXPAT_HOME/lib:$LD_LIBRARY_PATH
   
   # export variables that will be used by other programs
   #export PATH JAVA_HOME CLASSPATH LD_LIBRARY_PATH
   
   # export variables that will be used by other scripts
  -export APACHE2_HOME APACHE_HOME AXISCPP_HOME AXISCPP_DEPLOY AXISCPP_HOME_BIN AXISCPP_HOME_INCL
AXISCPP_TEST_BIN OUTPUT_DIR SERVICE_CONFIG WSDL2WS_HOME AXIS_JARS_HOME AXIS_JARS PATH JAVA_HOME
CLASSPATH LD_LIBRARY_PATH WSDLSRC_HOME
  +export TEST_HOME APACHE2_HOME APACHE_HOME AXISCPP_HOME AXISCPP_DEPLOY AXISCPP_HOME_BIN
AXISCPP_HOME_INCL AXISCPP_TEST_BIN OUTPUT_DIR SERVICE_CONFIG WSDL2WS_HOME AXIS_JARS_HOME AXIS_JARS
PATH JAVA_HOME CLASSPATH LD_LIBRARY_PATH WSDLSRC_HOME
   
   
   # The End
  
  
  

Mime
View raw message