[teiid-commits] teiid SVN: r2080 - in trunk/test-integration/db: src/main/resources/ctc_tests and 1 other directory.

Author: vhalbert(a)redhat.com Date: 2010-04-26 15:55:38 -0400 (Mon, 26 Apr 2010) New Revision: 2080 Modified: trunk/test-integration/db/runclienttest.sh trunk/test-integration/db/src/main/resources/ctc_tests/ctc.xml Log: Teiid-773 - changes to adjust work within hudson Modified: trunk/test-integration/db/runclienttest.sh =================================================================== --- trunk/test-integration/db/runclienttest.sh 2010-04-26 19:32:24 UTC (rev 2079) +++ trunk/test-integration/db/runclienttest.sh 2010-04-26 19:55:38 UTC (rev 2080) @@ -5,14 +5,12 @@ #============================ # REQUIRED PROPERTIES # -# - USEDATASOURCES - indicates the datasource(s) (common separated) to use, this is the directory located inside directory datasourceloc -$ #============================ # OPTIONAL PROPERTIES # # (if not set, will default to files within the db project) -# - QUERYSETDIR - directory location where the test querties can be found] +# - QUERYSETDIR - directory location where the test querties can be found # - SCENARIODIR - directory location where the scenario files found and determine which query sets and vdbs to use, # - DATASOURCEDIR - root directory location to find the various datasources to use # - CONFIGFILE - specify the configuration file to use (override ctc-test.properties) @@ -25,26 +23,6 @@ # JBEDSP_DEBUG=true # - -# the property that defines which datasources to use. these names must exist as directories within the datasource loc. -if [ -z "$USEDATASOURCES" ] - then - - echo "" - echo "Property <USEDATASOURCES> must be specified" - echo "Exit" - exit -fi - - - -#if [ -z "${vdb.artifacts.dir}" ] -# then -# -# vdb.artifacts.dir='./src/main/resources/transactions' -# -#fi - if [ -z "${QUERYSETDIR}" ] then @@ -66,7 +44,7 @@ DATASOURCEDIR='./src/main/resources/datasources' fi -echo "Use Datasources: ${USEDATASOURCES} loc: ${DATASOURCEDIR}" +echo "Use Datasource directory: ${DATASOURCEDIR}" #-------------------- @@ -106,8 +84,19 @@ #ANT_ARGS="${ANT_ARGS} -Dvdb.artifacts.dir=${vdb.artifacts.dir}" ANT_ARGS="${ANT_ARGS} -Dproj.dir=${PRGDIR}" +# default to the ip address used to start the server +SVRNAME="0.0.0.0" +if [ ! -z "${SERVERNAME}" ] + then + + SVRNAME=${SERVERNAME} +fi + +ANT_ARGS="${ANT_ARGS} -Dserver.host.name=${SVRNAME}" + + if [ ! -z "${XMLCLZZ}" ] then Modified: trunk/test-integration/db/src/main/resources/ctc_tests/ctc.xml =================================================================== --- trunk/test-integration/db/src/main/resources/ctc_tests/ctc.xml 2010-04-26 19:32:24 UTC (rev 2079) +++ trunk/test-integration/db/src/main/resources/ctc_tests/ctc.xml 2010-04-26 19:55:38 UTC (rev 2080) @@ -159,11 +159,9 @@ <jvmarg value="-Dquery.scenario.classname=${query.scenario.classname}" /> <jvmarg value="-Dusedatasources=${usedatasources}" /> <jvmarg value="-Ddatasourceloc=${datasourceloc}" /> + <jvmarg value="-Dserver.host.name=${server.host.name}" /> <jvmarg value="-Dproj.dir=${proj_dir}" /> - <!-- - <jvmarg value="-Dvdb.artifacts.dir=${vdb_artifacts_dir}" /> - --> </java> @@ -193,11 +191,8 @@ <jvmarg value="-Dquery.scenario.classname=${query.scenario.classname}" /> <jvmarg value="-Dusedatasources=${usedatasources}" /> <jvmarg value="-Ddatasourceloc=${datasourceloc}" /> + <jvmarg value="-Dserver.host.name=${server.host.name}" /> <jvmarg value="-Dproj.dir=${proj_dir}" /> - - <!-- - <jvmarg value="-Dvdb.artifacts.dir=${vdb_artifacts_dir}" /> - --> </java>