svn commit: r369840 - /incubator/harmony/enhanced/classlib/trunk/modules/security2/make/build.xml

[ge...@apache.org]

Author: geirm
Date: Tue Jan 17 09:09:11 2006
New Revision: 369840

URL: http://svn.apache.org/viewcvs?rev=369840&view=rev
Log:
regress to put the junit and bcprov in classpath for now and
turn on stop on fail inorder to figure out what's wrong
now that I've done some trivial refactoring


Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/security2/make/build.xml

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/make/build.xml?rev=369840&r1=369839&r2=369840&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/make/build.xml Tue Jan 17 09:09:11 2006
@@ -220,6 +220,7 @@
         <include name="common/unit/com/openintel/drl/security/**"/>
         <include name="common/unit/com/openintel/drlx/crypto/**"/>
         <include name="common/unit/com/openintel/drlx/security/**"/>
+        <include name="common/unit/org/apache/harmony/security/**"/>
         <include name="common/unit/com/openintel/fortress/drl/security/**"/>
         <include name="common/unit/java/security/**"/>
         <include name="common/unit/javax/crypto/**"/>
@@ -338,11 +339,10 @@
     <target name="tests.compile">
     	
     	<!-- download the jars we need for testing and create a path -->
-    	
+
+    	<!--
     	<ant antfile="make/download.xml" target="test-download" />
     		
-        <mkdir dir="${build.path}/tests_report" />
-
     	<path id="sec.test.path">
     		<fileset dir="${build.path}/lib">
 		        <include name="**/*.jar"/>
@@ -350,7 +350,8 @@
 	     </path>
     		
     	<property name="test.deps.path" refid="sec.test.path" />
-
+        -->
+    	
         <echo message="Compiling Security tests from ${src.tst.common}/unit, ${src.tst.common.ps}/unit" />
     
         <mkdir dir="${build.path}/tests" />
@@ -377,7 +378,9 @@
     </target>
 
     <target name="run">
-    	
+
+        <mkdir dir="${build.path}/tests_report" />
+
     	<!-- run the tests -->
     	
         <junit fork="yes"
@@ -385,11 +388,13 @@
             printsummary="withOutAndErr"
             errorproperty="test.error"
             showoutput="on"
+        	haltonfailure="on"
             dir="${basedir}"
             jvm="${env.JAVA_HOME}/bin/java">
  
         	<jvmarg value="-Xbootclasspath/p:${build.path}/classes/security_alt.jar${path.separator}${build.jars.path}/crypto.jar${path.separator}${build.jars.path}/x_net.jar"/>
-            <jvmarg value="-Xbootclasspath/a:${build.path}/tests${path.separator}${test.deps.path}"/>
+<!--            <jvmarg value="-Xbootclasspath/a:${build.path}/tests${path.separator}${test.deps.path}"/> -->
+            <jvmarg value="-Xbootclasspath/a:${build.path}/tests${path.separator}${env.CLASSPATH}"/>
             <jvmarg value="-Dreference.output=${src.tst.common}/unit" />
             <jvmarg value="-Dunit.test.root=${src.tst.common}/unit"/>
             <jvmarg value="-Djava.security.properties==${build.lib.path}/security/java.security"/>