harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r792523 [1/3] - in /harmony/enhanced/classlib/trunk: make/ modules/luni/ modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ modules/luni/src/test/...
Date Thu, 09 Jul 2009 12:18:51 GMT
Author: hindessm
Date: Thu Jul  9 12:18:51 2009
New Revision: 792523

URL: http://svn.apache.org/viewvc?rev=792523&view=rev
Log:
Move support/src/test/resources/net.resources to luni since they are only
used there and since they need to be copied to the hdk for tests to work.
Make luni tests run in hdk subdirectory rather than in modules/luni/bin/test
and fix some tests for this to work.
Remove references to hy.hdk from run-test.xml since this variable is
undefined.
Fix run-tests macro to run tests in same location in hdk as when tests are
run from the checked out code tree.

Added:
    harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/net.resources/   (props
changed)
      - copied from r790476, harmony/enhanced/classlib/trunk/support/src/test/resources/net.resources/
Removed:
    harmony/enhanced/classlib/trunk/support/src/test/resources/net.resources/
Modified:
    harmony/enhanced/classlib/trunk/make/run-test.xml
    harmony/enhanced/classlib/trunk/modules/luni/build.xml
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectStreamClassTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URLClassLoaderTest.java
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URLTest.java

Modified: harmony/enhanced/classlib/trunk/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/run-test.xml?rev=792523&r1=792522&r2=792523&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/run-test.xml (original)
+++ harmony/enhanced/classlib/trunk/make/run-test.xml Thu Jul  9 12:18:51 2009
@@ -56,20 +56,20 @@
         <run-tests module="luni" jar="luni_tests_api.jar">
             <junit-elements>
                 <!-- Required by various tests that set security manager etc -->
-                <jvmarg value="-Djava.security.policy=${hy.hdk}/build/test/testing.policy"
/>
+                <jvmarg value="-Djava.security.policy=${target.dir}/../testing.policy"
/>
 
                 <!-- Required for running the java.net unit tests -->
-                <jvmarg value="-Dtest.ini.file=${target.dir}/luni/resources/config/localhosttest.ini"
/>
+                <jvmarg value="-Dtest.ini.file=${target.dir}/resources/config/localhosttest.ini"
/>
             </junit-elements>
         </run-tests>    
 
         <run-tests module="luni" jar="luni_tests_impl.jar">
             <junit-elements>
                 <!-- Required by various tests that set security manager etc -->
-                <jvmarg value="-Djava.security.policy=${hy.hdk}/build/test/testing.policy"
/>
+                <jvmarg value="-Djava.security.policy=${target.dir}/../testing.policy"
/>
 
                 <!-- Required for running the java.net unit tests -->
-                <jvmarg value="-Dtest.ini.file=${target.dir}/luni/resources/config/localhosttest.ini"
/>
+                <jvmarg value="-Dtest.ini.file=${target.dir}/resources/config/localhosttest.ini"
/>
             </junit-elements>
         </run-tests>
     </target>
@@ -135,7 +135,7 @@
                    errorproperty="test.errors" 
                    failureproperty="test.failures" 
                    showoutput="on" 
-                   dir="${work.dir}" 
+                   dir="${work.dir}/@{module}" 
                    tempdir="${work.dir}"
                    jvm="${test.jre.home}/bin/java">
 

Modified: harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/build.xml?rev=792523&r1=792522&r2=792523&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/build.xml Thu Jul  9 12:18:51 2009
@@ -53,7 +53,6 @@
     <property file="../../make/depends.properties" />
     <property name="fdlibm.zip" location="${depends.oss}/fdlibm_5.2.zip" />
 
-    <property name="tests.hdk.dir" value="${hy.hdk}/build/test/luni" />
     <property name="luni.exclude.file"
               location="${tests.hdk.dir}/test.exclude" />
 
@@ -222,7 +221,7 @@
     </target>
 
     <!-- internal target for local and global test run sequence -->
-    <target name="-test-module" depends="build, compile-tests, prepare-exclude, test-jar,
run-tests" />
+    <target name="-test-module" depends="build, test-jar, run-tests" />
 
     <target name="clean" depends="clean-native-includes" >
         <delete file="${hy.jdk}/jre/lib/boot/luni.jar" />
@@ -320,6 +319,7 @@
         <copy todir="${tests.resources.hdk.dir}">
             <fileset dir="${hy.luni.src.test.resources}" >
                 <include name="org/**/*"/>
+                <include name="net.resources/**/*"/>
             </fileset>
         </copy>
 
@@ -378,7 +378,7 @@
     
     <target name="prepare-exclude">
         <prepare-exclude-list moduleName="luni" dir="./make"
-                             result="${luni.exclude.file}"/>
+                              result="${luni.exclude.file}"/>
     </target>
 
     <!-- run both api tests and impl tests -->
@@ -528,7 +528,7 @@
                    errorproperty="test.errors"
                    failureproperty="test.failures"
                    showoutput="on"
-                   dir="${basedir}"
+                   dir="${tests.hdk.dir}"
                    jvm="${test.jre.home}/bin/java">
 
                 <assertions enableSystemAssertions="true">
@@ -543,7 +543,7 @@
                 <jvmarg value="-Djava.security.policy=${hy.hdk}/build/test/testing.policy"
/>
 
                 <!-- Required for running the java.net unit tests -->
-                <jvmarg value="-Dtest.ini.file=../../support/src/test/resources/config/localhosttest.ini"
/>
+                <jvmarg value="-Dtest.ini.file=${tests.hdk.dir}/resources/config/localhosttest.ini"
/>
 
                 <junit-elements />
 

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectStreamClassTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectStreamClassTest.java?rev=792523&r1=792522&r2=792523&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectStreamClassTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectStreamClassTest.java
Thu Jul  9 12:18:51 2009
@@ -131,7 +131,7 @@
      */
     public void test_getSerialVersionUID_classloader() throws Exception {
         File file = new File(
-                "src/test/resources/org/apache/harmony/luni/tests/ObjectStreamClassTest.jar");
+                "resources/org/apache/harmony/luni/tests/ObjectStreamClassTest.jar");
         ClassLoader loader = new URLClassLoader(new URL[] { file.toURL() },
                 null);
         Class cl1 = Class.forName("Test1$TestVarArgs", false, loader);

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URLClassLoaderTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URLClassLoaderTest.java?rev=792523&r1=792522&r2=792523&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URLClassLoaderTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URLClassLoaderTest.java
Thu Jul  9 12:18:51 2009
@@ -44,7 +44,7 @@
 
     private static final String PREFIX = "http://localhost:";
 
-    private static final String ROOT = "../../support/src/test/resources/net.resources/HTTP/html/testres231";
+    private static final String ROOT = "resources/net.resources/HTTP/html/testres231";
 
     private static String serverURL = null;
 



Mime
View raw message