Author: vhalbert(a)redhat.com Date: 2010-11-09 17:45:31 -0500 (Tue, 09 Nov 2010) New Revision: 2717 Modified: branches/7.1.x/test-integration/db/src/main/resources/ctc_tests/ctc.xml branches/7.1.x/test-integration/db/src/main/resources/ctc_tests/runclienttest.sh Log: TEIID-1354 updated scripts to support overriding the output directory Modified: branches/7.1.x/test-integration/db/src/main/resources/ctc_tests/ctc.xml =================================================================== --- branches/7.1.x/test-integration/db/src/main/resources/ctc_tests/ctc.xml 2010-11-09 17:24:57 UTC (rev 2716) +++ branches/7.1.x/test-integration/db/src/main/resources/ctc_tests/ctc.xml 2010-11-09 22:45:31 UTC (rev 2717) @@ -6,7 +6,7 @@ <classpath> <pathelement path="${maven.runtime.classpath}" /> </classpath> - </taskdef> + </taskdef> <target name="main" depends="init, is.config.file, set.default.config.file, set.config.file" if="" unless="" description="create all property files"> @@ -36,8 +36,8 @@ <available file="${scenario.dir}/${scenario.file}" /> </condition> - <delete file="${ERROR_FILE}"/> - + <delete file="${ERROR_FILE}"/> + </target> <target name="set.win" @@ -84,7 +84,7 @@ <property name="use.config.file" value="${config.file}" /> <echo>USE CONFIG: ${use.config.file}</echo> - </target> + </target> <target name="run.all.test" unless="single" > @@ -143,6 +143,11 @@ <map from="\" to="/"/> <path location="${vdb.artifacts.dir}"/> </pathconvert> + + <pathconvert targetos="unix" property="outpu_.dir" > + <map from="\" to="/"/> + <path location="${output.dir}"/> + </pathconvert> <java classname="org.teiid.test.client.TestClient" fork="true" > @@ -153,6 +158,9 @@ </fileset> </classpath> <jvmarg value="-Xmx1024m" /> + <!-- + <jvmarg value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y" /> + --> <jvmarg value="-Dconfig=${use.config.file}" /> <jvmarg value="-Dscenariofile=${scenario_file}" /> <jvmarg value="-Dqueryset.artifacts.dir=${queryset_artifacts_dir}" /> @@ -161,7 +169,7 @@ <jvmarg value="-Ddatasourceloc=${datasourceloc}" /> <jvmarg value="-Dserver.host.name=${server.host.name}" /> <jvmarg value="-Dproj.dir=${proj_dir}" /> - + <jvmarg value="-Doutput.dir=${output_dir}" /> </java> @@ -185,6 +193,9 @@ </fileset> </classpath> <jvmarg value="-Xmx1024m" /> + <!-- + <jvmarg value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y" /> + --> <jvmarg value="-Dconfig=${use.config.file}" /> <jvmarg value="-Dscenariofile=${scenario.file}" /> <jvmarg value="-Dqueryset.artifacts.dir=${queryset.artifacts.dir}" /> @@ -193,6 +204,7 @@ <jvmarg value="-Ddatasourceloc=${datasourceloc}" /> <jvmarg value="-Dserver.host.name=${server.host.name}" /> <jvmarg value="-Dproj.dir=${proj_dir}" /> + <jvmarg value="-Doutput.dir=${output.dir}" /> </java> Modified: branches/7.1.x/test-integration/db/src/main/resources/ctc_tests/runclienttest.sh =================================================================== --- branches/7.1.x/test-integration/db/src/main/resources/ctc_tests/runclienttest.sh 2010-11-09 17:24:57 UTC (rev 2716) +++ branches/7.1.x/test-integration/db/src/main/resources/ctc_tests/runclienttest.sh 2010-11-09 22:45:31 UTC (rev 2717) @@ -14,7 +14,7 @@ # - 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) - +# - OUTPUTDIR - optional, can set the location the reports and generated files will be writtent o ###################################################### # DEBUGGING OPTION # @@ -84,6 +84,15 @@ #ANT_ARGS="${ANT_ARGS} -Dvdb.artifacts.dir=${vdb.artifacts.dir}" ANT_ARGS="${ANT_ARGS} -Dproj.dir=${PRGDIR}" +if [ -z "${OUTPUTDIR}" ] + then + + OUTPUTDIR=${PRGDIR} + +fi + +ANT_ARGS="${ANT_ARGS} -Doutput.dir=${OUTPUTDIR}" + # default to the ip address used to start the server SVRNAME="0.0.0.0" @@ -133,6 +142,8 @@ mkdir "${PRGDIR}"/log fi +#JAVA_OPTS="$JAVA_OPTS -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y" + if [ -n "${JAVA_OPTS}" ]; then ANT_OPTS="${JAVA_OPTS} $ANT_OPTS " fi