Author: sebb
Date: Fri Aug 12 02:05:05 2011
New Revision: 1156938
URL: http://svn.apache.org/viewvc?rev=1156938&view=rev
Log:
Allow test encoding to be specified
Modified:
jakarta/jmeter/trunk/build.xml
Modified: jakarta/jmeter/trunk/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/build.xml?rev=1156938&r1=1156937&r2=1156938&view=diff
==============================================================================
--- jakarta/jmeter/trunk/build.xml (original)
+++ jakarta/jmeter/trunk/build.xml Fri Aug 12 02:05:05 2011
@@ -302,6 +302,8 @@
<property name="target.java.version" value="1.5"/>
<property name="src.java.version" value="1.5"/>
<property name="encoding" value="UTF-8"/>
+ <!-- Set test encoding to the same default, but allow override -->
+ <property name="test.encoding" value="${encoding}"/>
<property name="includeAntRuntime" value="false"/>
<!-- 3rd party libraries to be included in the binary distribution -->
@@ -1978,6 +1980,7 @@ run JMeter unless all the JMeter jars ar
test dir = ${build.test}
test dir gump = ${build.test.gump}
testsaveservice.saveout = ${testsaveservice.saveout}
+ test.encoding = ${test.encoding}
</echo>
<delete quiet="true">
<fileset dir="${basedir}/bin/testfiles" includes="*.jmx.out"/>
@@ -1990,6 +1993,7 @@ run JMeter unless all the JMeter jars ar
<path refid="classpath"/>
</classpath>
<jvmarg value="-server"/>
+ <jvmarg value="-Dfile.encoding=${test.encoding}"/>
<sysproperty key="java.awt.headless" value="${test.headless}"/>
<sysproperty key="testsaveservice.saveout"
value="${testsaveservice.saveout}" />
<arg value="${build.test}"/>
@@ -2012,6 +2016,7 @@ run JMeter unless all the JMeter jars ar
printsummary="withOutAndErr">
<formatter type="${test.format}" usefile="no"/>
<formatter type="xml"/>
+ <jvmarg value="-Dfile.encoding=${test.encoding}"/>
<classpath>
<fileset dir="${dest.jar}" includes="*.jar"/>
<pathelement location="${build.test}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
