svn commit: r369910 - /jakarta/jmeter/branches/rel-2-1/build.xml

[se...@apache.org]

Author: sebb
Date: Tue Jan 17 12:40:24 2006
New Revision: 369910

URL: http://svn.apache.org/viewcvs?rev=369910&view=rev
Log:
Remove tests from htmlparser.jar
Add htmlparser tests to main test suite

Modified:
    jakarta/jmeter/branches/rel-2-1/build.xml

Modified: jakarta/jmeter/branches/rel-2-1/build.xml
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/build.xml?rev=369910&r1=369909&r2=369910&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/build.xml (original)
+++ jakarta/jmeter/branches/rel-2-1/build.xml Tue Jan 17 12:40:24 2006
@@ -894,7 +894,9 @@
       <fileset dir="${src.jms}" includes="**/*.properties" />
     </jar>
     
-    <jar jarfile="${lib.dir}/htmlparser.jar" basedir="${build.htmlparser}"/>
+    <jar jarfile="${lib.dir}/htmlparser.jar" basedir="${build.htmlparser}"
+    	excludes="org/htmlparser/tests/**/*.class"/>
+  	
     <jar jarfile="${lib.dir}/jorphan.jar" basedir="${build.jorphan}"/>
   </target>
 
@@ -1409,11 +1411,12 @@
       <classpath>
     	<fileset dir="${dest.jar}" includes="*.jar"/>
 	    <pathelement location="${build.test}"/>
+	    <pathelement location="${build.htmlparser}"/>
     	<path refid="classpath"/>
       </classpath>
       <sysproperty key="java.awt.headless" value="${test.headless}"/>
       <sysproperty key="testsaveservice.saveout" value="${testsaveservice.saveout}" />
-      <arg value="${build.test.gump},../lib/ext"/>
+      <arg value="${build.test.gump},${build.htmlparser},../lib/ext"/>
       <arg value="./jmetertest.properties"/>
       <arg value="org.apache.jmeter.util.JMeterUtils"/>
     </java>



---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org