Patrick--
Hey; I'd rather have this go through one of the people focused on controls testing. James, can you look at this patch?
One question I do have about the patch is why we're adding shell scripts to the tree? Why aren't these just <java> calls in an Ant build file? Seems easier to maintain / test across platforms and shells.
Thanks!
Eddie
Patrick Osborne wrote:
Hi Eddie,
Would you please check-in the following controls perf test build changes. This will fix several broken tests.
Thanks, Patrick.
------------------------------------------------------------------------
Index: controls/test/perf/bin/perf.bat
===================================================================
--- controls/test/perf/bin/perf.bat (revision 164636)
+++ controls/test/perf/bin/perf.bat (working copy)
@@ -1 +1 @@
-java -Xmx64m -classpath %BEEHIVE_PERFROOT%\build;%BEEHIVE_PERFROOT%\ctlbuild;%BEEHIVE_PERFROOT%\..\..\..\controls\build\jars\controls.jar org.apache.beehive.controls.perf.standalone.%* +java -Xmx64m -classpath %BEEHIVE_PERFROOT%\build;%BEEHIVE_PERFROOT%\ctlbuild;%BEEHIVE_PERFROOT%\..\..\..\build\dist\apache-beehive-incubating-svn-snapshot\lib\controls\beehive-controls.jar org.apache.beehive.controls.perf.standalone.%* Index: controls/test/perf/bin/perf.sh
===================================================================
--- controls/test/perf/bin/perf.sh (revision 164636)
+++ controls/test/perf/bin/perf.sh (working copy)
@@ -1 +1 @@
-java -Xmx64m -classpath $BEEHIVE_PERFROOT/build:$BEEHIVE_PERFROOT/ctlbuild:$BEEHIVE_PERFROOT/../../../controls/build/jars/controls.jar org.apache.beehive.controls.perf.standalone.$* +java -Xmx64m -classpath $BEEHIVE_PERFROOT/build:$BEEHIVE_PERFROOT/ctlbuild:$BEEHIVE_PERFROOT/../../../build/dist/apache-beehive-incubating-svn-snapshot/lib/controls/beehive-controls.jar org.apache.beehive.controls.perf.standalone.$* Index: controls/test/perf/build.xml
===================================================================
--- controls/test/perf/build.xml (revision 164636)
+++ controls/test/perf/build.xml (working copy)
@@ -205,8 +205,10 @@
<property name="gtlf.dtd.use.remote" value="true"/>
<property name="gtlf.dtd.remote" value="http://incubator.apache.org/beehive/dtd/gtlf/gtlf-config-2.0.dtd"/>
<property name="gtlf.dtd.local" value="infra/gtlf/gtlf-config-2.0.dtd"/>
- <property name="tch.log.basedir" value="${control.perf.logs}"/>
+ <property name="tch.log.basedir" location="${control.perf.logs}"/>
<property name="tch.base-logfile-name" value="tch"/>
+ <echo>tch.log.basedir( ${tch.log.basedir} )</echo> + <mkdir dir="${tch.log.basedir}"/>
<tch tchHome="${tch.home}"
testfile="${test-suite}"
fork="true"
@@ -233,6 +235,7 @@
</target> <target name="checkin.tests.client">
+ <echo>Running test client</echo>
<property name="test-suite" value="${control.perf.root}/cases/controls-perf.xml"/>
<property name="test.freq" value="bvt"/>
<property name="tch.log.debug-level" value="0"/>
