You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2009/07/14 22:05:44 UTC

svn commit: r794047 - in /harmony/enhanced/classlib/trunk: make/run-test.xml modules/accessibility/make/run-test.xml modules/luni/build.xml modules/luni/make/run-test.xml modules/security/make/run-test.xml

Author: hindessm
Date: Tue Jul 14 20:05:44 2009
New Revision: 794047

URL: http://svn.apache.org/viewvc?rev=794047&view=rev
Log:
Remove duplicate properties.xml from hdk/build/test in order to make
progress on hdk testing changes.  However, Sean might be right about
having a copy to make the tests standalone but it needs to be
distinct - i.e. have a unique name or you get warnings about including
it twice.  There is an example of a suitable copy process with filtering
in classlib/build.xml.

Modified:
    harmony/enhanced/classlib/trunk/make/run-test.xml
    harmony/enhanced/classlib/trunk/modules/accessibility/make/run-test.xml
    harmony/enhanced/classlib/trunk/modules/luni/build.xml
    harmony/enhanced/classlib/trunk/modules/luni/make/run-test.xml
    harmony/enhanced/classlib/trunk/modules/security/make/run-test.xml

Modified: harmony/enhanced/classlib/trunk/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/run-test.xml?rev=794047&r1=794046&r2=794047&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/run-test.xml (original)
+++ harmony/enhanced/classlib/trunk/make/run-test.xml Tue Jul 14 20:05:44 2009
@@ -21,7 +21,7 @@
     <property name="test.jre.home" location="../../jdk/jre" />
     <property file="test.properties" />
     <property name="build.module" value="all"/>
-    <import file="properties.xml" />
+    <import file="../ant/properties.xml" />
 
     <!-- These two parameters could be assigned by user -->
     <property name="target.dir" value="." />

Modified: harmony/enhanced/classlib/trunk/modules/accessibility/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/accessibility/make/run-test.xml?rev=794047&r1=794046&r2=794047&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/accessibility/make/run-test.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/accessibility/make/run-test.xml Tue Jul 14 20:05:44 2009
@@ -20,7 +20,7 @@
 
     <property name="test.jre.home" location="../../../jdk/jre" />
     <property file="../test.properties" />
-    <import file="../properties.xml" />
+    <import file="../../ant/properties.xml" />
 
     <property name="work.dir" value=".." />
     <property name="target.dir" value=".." />

Modified: harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/build.xml?rev=794047&r1=794046&r2=794047&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/build.xml Tue Jul 14 20:05:44 2009
@@ -349,8 +349,6 @@
             </filterchain>
         </copy>
 
-        <copy todir="${tests.hdk.dir}/.." file="${hy.hdk}/build/ant/properties.xml"/>
-
     </target>
 
     <!-- compile both api tests and impl tests-->

Modified: harmony/enhanced/classlib/trunk/modules/luni/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/make/run-test.xml?rev=794047&r1=794046&r2=794047&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/make/run-test.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/make/run-test.xml Tue Jul 14 20:05:44 2009
@@ -20,7 +20,7 @@
 
     <property name="test.jre.home" location="../../../jdk/jre" />
     <property file="../test.properties" />
-    <import file="../properties.xml" />
+    <import file="../../ant/properties.xml" />
 
     <property name="work.dir" value=".." />
     <property name="target.dir" value=".." />

Modified: harmony/enhanced/classlib/trunk/modules/security/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/make/run-test.xml?rev=794047&r1=794046&r2=794047&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/make/run-test.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/security/make/run-test.xml Tue Jul 14 20:05:44 2009
@@ -20,7 +20,7 @@
 
     <property name="test.jre.home" location="../../../jdk/jre" />
     <property file="../test.properties" />
-    <import file="../properties.xml" />
+    <import file="../../ant/properties.xml" />
 
     <property name="work.dir" value=".." />
     <property name="target.dir" value=".." />