harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r934733 - in /harmony/enhanced/java/trunk/classlib: make/ modules/crypto/make/ modules/lang-management/make/ modules/luni/make/ modules/security/make/ modules/x-net/make/
Date Fri, 16 Apr 2010 10:34:12 GMT
Author: hindessm
Date: Fri Apr 16 10:34:11 2010
New Revision: 934733

URL: http://svn.apache.org/viewvc?rev=934733&view=rev
Log:
Attempt to add property to turn off implementation tests so that API tests
may be executed on other JREs.

Modified:
    harmony/enhanced/java/trunk/classlib/make/properties.xml
    harmony/enhanced/java/trunk/classlib/modules/crypto/make/run-test.xml
    harmony/enhanced/java/trunk/classlib/modules/lang-management/make/run-test.xml
    harmony/enhanced/java/trunk/classlib/modules/luni/make/run-test.xml
    harmony/enhanced/java/trunk/classlib/modules/security/make/run-test.xml
    harmony/enhanced/java/trunk/classlib/modules/x-net/make/run-test.xml

Modified: harmony/enhanced/java/trunk/classlib/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/make/properties.xml?rev=934733&r1=934732&r2=934733&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/make/properties.xml (original)
+++ harmony/enhanced/java/trunk/classlib/make/properties.xml Fri Apr 16 10:34:11 2010
@@ -64,6 +64,7 @@
     <property name="hy.test.forkmode" value="once" />
     <property name="hy.test.timeout" value="900000" />
     <property name="hy.test.vmargs" value="" />
+    <property name="hy.test.impl" value="true" />
 
     <!-- Conditions for operating systems -->
     <condition property="is.windows">

Modified: harmony/enhanced/java/trunk/classlib/modules/crypto/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/crypto/make/run-test.xml?rev=934733&r1=934732&r2=934733&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/crypto/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/crypto/make/run-test.xml Fri Apr 16 10:34:11
2010
@@ -31,7 +31,9 @@
 
     <target name="test" depends="test-module" />
 
-    <target name="test-module" depends="test-jre-vm-info">
+    <target name="test-module"
+            depends="-test-module,-test-module-impl">
+    <target name="-test-module" depends="test-jre-vm-info">
         <convert-test-as-class from="test.case" to="converted.tc.class" />
         <run-hdk-tests module="crypto" jar="crypto_api_tests.jar">
             <junit-elements>
@@ -49,6 +51,9 @@
                 </classpath>
             </junit-elements>
         </run-hdk-tests>
+    </target>
+
+    <target name="-test-module-impl" if="hy.test.impl">
         <run-hdk-tests module="crypto" jar="crypto_impl_tests.jar">
             <junit-elements>
                 <classpath>

Modified: harmony/enhanced/java/trunk/classlib/modules/lang-management/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/lang-management/make/run-test.xml?rev=934733&r1=934732&r2=934733&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/lang-management/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/lang-management/make/run-test.xml Fri Apr
16 10:34:11 2010
@@ -31,10 +31,15 @@
 
     <target name="test" depends="test-module" />
 
-    <target name="test-module" depends="test-jre-vm-info">
+    <target name="test-module"
+            depends="-test-module,-test-module-impl">
+    <target name="-test-module" depends="test-jre-vm-info">
         <convert-test-as-class from="test.case" to="converted.tc.class" />
         <run-hdk-tests module="lang-management"
                        jar="lang-management_tests.jar" />
+    </target>
+
+    <target name="-test-module-impl" if="hy.test.impl">
         <run-hdk-tests module="lang-management"
                        jar="lang-management_impl_tests.jar" />
     </target>

Modified: harmony/enhanced/java/trunk/classlib/modules/luni/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni/make/run-test.xml?rev=934733&r1=934732&r2=934733&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/luni/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/luni/make/run-test.xml Fri Apr 16 10:34:11
2010
@@ -31,7 +31,9 @@
 
     <target name="test" depends="test-module" />
 
-    <target name="test-module" depends="test-jre-vm-info">
+    <target name="test-module"
+            depends="-test-module,-test-module-impl">
+    <target name="-test-module" depends="test-jre-vm-info">
         <convert-test-as-class from="test.case" to="converted.tc.class" />
         <run-hdk-tests module="luni" jar="luni_tests_api.jar">
             <excludeorinclude>
@@ -44,8 +46,10 @@
                 <!-- Required for running the java.net unit tests -->
                 <jvmarg value="-Dtest.ini.file=resources/config/localhosttest.ini" />
             </junit-elements>
-        </run-hdk-tests>    
+        </run-hdk-tests>
+    </target>
 
+    <target name="-test-module-impl" if="hy.test.impl">
         <run-hdk-tests module="luni" jar="luni_tests_impl.jar">
             <junit-elements>
                 <!-- Required by various tests that set security manager etc -->

Modified: harmony/enhanced/java/trunk/classlib/modules/security/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/security/make/run-test.xml?rev=934733&r1=934732&r2=934733&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/security/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/security/make/run-test.xml Fri Apr 16 10:34:11
2010
@@ -31,7 +31,9 @@
 
     <target name="test" depends="test-module" />
 
-    <target name="test-module" depends="test-jre-vm-info">
+    <target name="test-module"
+            depends="-test-module,-test-module-impl">
+    <target name="-test-module" depends="test-jre-vm-info">
         <convert-test-as-class from="test.case" to="converted.tc.class" />
         <run-hdk-tests module="security" jar="security_tests_api.jar">
             <junit-elements>
@@ -45,6 +47,9 @@
                 <jvmarg value="-Xbootclasspath/a:security_tests_api_in.jar${path.separator}../junit.jar${path.separator}../support.jar${path.separator}security_tests_support.jar"/>
             </junit-elements>
         </run-hdk-tests>
+    </target>
+
+    <target name="-test-module-impl" if="hy.test.impl">
         <run-hdk-tests module="security" jar="security_tests_impl.jar">
             <junit-elements>
                 <classpath>

Modified: harmony/enhanced/java/trunk/classlib/modules/x-net/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/x-net/make/run-test.xml?rev=934733&r1=934732&r2=934733&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/x-net/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/x-net/make/run-test.xml Fri Apr 16 10:34:11
2010
@@ -31,7 +31,9 @@
 
     <target name="test" depends="test-module" />
 
-    <target name="test-module" depends="test-jre-vm-info">
+    <target name="test-module"
+            depends="-test-module,-test-module-impl">
+    <target name="-test-module" depends="test-jre-vm-info">
         <convert-test-as-class from="test.case" to="converted.tc.class" />
         <run-hdk-tests module="x-net" jar="x-net_api_tests.jar">
             <junit-elements>
@@ -41,6 +43,9 @@
                 </classpath>
             </junit-elements>
         </run-hdk-tests>
+    </target>
+
+    <target name="-test-module-impl" if="hy.test.impl">
         <run-hdk-tests module="x-net" jar="x-net_impl_tests.jar">
             <junit-elements>
                 <classpath>



Mime
View raw message