Author: sebb
Date: Sat Oct  6 16:57:17 2007
New Revision: 582562

URL: http://svn.apache.org/viewvc?rev=582562&view=rev
Log:
Move jmetertest.properties to testfiles directory

Added:
    jakarta/jmeter/trunk/bin/testfiles/jmetertest.properties
      - copied unchanged from r582548, 
jakarta/jmeter/trunk/bin/jmetertest.properties
Removed:
    jakarta/jmeter/trunk/bin/jmetertest.properties
Modified:
    jakarta/jmeter/trunk/build.xml

Modified: jakarta/jmeter/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/build.xml?rev=582562&r1=582561&r2=582562&view=diff
==============================================================================
--- jakarta/jmeter/trunk/build.xml (original)
+++ jakarta/jmeter/trunk/build.xml Sat Oct  6 16:57:17 2007
@@ -1009,7 +1009,6 @@
     <include name="${dest.jar.jmeter}/ApacheJMeter.jar"/>
     <include name="${dest.jar.jmeter}/BeanShell*.bshrc"/>
     <include name="${dest.jar.jmeter}/jmeter*"/>
-    <exclude name="${dest.jar.jmeter}/jmetertest.properties"/>
     <include name="${dest.jar.jmeter}/log4j.conf"/>
     <include name="${dest.jar.jmeter}/logkit.xml"/>
     <include name="${dest.jar.jmeter}/upgrade.properties"/>
@@ -1047,7 +1046,6 @@
     <include name="${src.test}/**"/>
     <include name="build.xml"/>
     <include name="build.properties"/>
-    <include name="${dest.jar.jmeter}/jmetertest.properties"/>
     <include name="${dest.jar.jmeter}/testfiles/**"/>
     <exclude name="${dest.jar.jmeter}/testfiles/*.out"/>
     <include name="eclipse.classpath"/>
@@ -1609,8 +1607,7 @@
       <sysproperty key="java.awt.headless" value="${test.headless}"/>
       <sysproperty key="testsaveservice.saveout" 
value="${testsaveservice.saveout}" />
       <arg value="${build.test},../lib/ext"/>
-       <!-- The file must currently be in the JMeter home directory as it is 
used to find the home directory -->
-      <arg value="./jmetertest.properties"/>
+      <arg value="${basedir}/bin/testfiles/jmetertest.properties"/>
       <arg value="org.apache.jmeter.util.JMeterUtils"/>
     </java>
   </target>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to