You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by od...@apache.org on 2009/05/20 18:49:08 UTC
svn commit: r776762 - in /harmony/enhanced/classlib/trunk:
make/build-test.xml make/run-test.xml modules/logging/build.xml
modules/luni/build.xml
Author: odeakin
Date: Wed May 20 16:49:07 2009
New Revision: 776762
URL: http://svn.apache.org/viewvc?rev=776762&view=rev
Log:
Use testing.policy from a central location and make sure it is in UTF-8 encoding.
Modified:
harmony/enhanced/classlib/trunk/make/build-test.xml
harmony/enhanced/classlib/trunk/make/run-test.xml
harmony/enhanced/classlib/trunk/modules/logging/build.xml
harmony/enhanced/classlib/trunk/modules/luni/build.xml
Modified: harmony/enhanced/classlib/trunk/make/build-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/build-test.xml?rev=776762&r1=776761&r2=776762&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/build-test.xml (original)
+++ harmony/enhanced/classlib/trunk/make/build-test.xml Wed May 20 16:49:07 2009
@@ -155,6 +155,8 @@
</fileset>
<fileset file="${support.dir}/src/test/resources/hyts_Foo.c"/>
</copy>
+ <copy file="${support.dir}/src/test/resources/config/testing.policy"
+ todir="${hy.hdk}/build/test" outputencoding="UTF-8" />
</target>
<target name="check-support-jars"
@@ -182,7 +184,7 @@
<!-- Required by various tests that set security manager etc -->
- <jvmarg value="-Djava.security.policy=${support.dir}/src/test/resources/config/testing.policy" />
+ <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.dir}/src/test/resources/config/localhosttest.ini" />
@@ -223,7 +225,7 @@
<!-- required to be unset on Linux -->
<!-- Required by various tests that set security manager etc -->
- <jvmarg value="-Djava.security.policy=${support.dir}/src/test/resources/config/testing.policy" />
+ <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.dir}/src/test/resources/config/localhosttest.ini" />
Modified: harmony/enhanced/classlib/trunk/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/run-test.xml?rev=776762&r1=776761&r2=776762&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/run-test.xml (original)
+++ harmony/enhanced/classlib/trunk/make/run-test.xml Wed May 20 16:49:07 2009
@@ -55,7 +55,7 @@
<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=${target.dir}/luni/resources/config/testing.policy" />
+ <jvmarg value="-Djava.security.policy=${hy.hdk}/build/test/testing.policy" />
<!-- Required for running the java.net unit tests -->
<jvmarg value="-Dtest.ini.file=${target.dir}/luni/resources/config/localhosttest.ini" />
@@ -65,7 +65,7 @@
<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=${target.dir}/luni/resources/config/testing.policy" />
+ <jvmarg value="-Djava.security.policy=${hy.hdk}/build/test/testing.policy" />
<!-- Required for running the java.net unit tests -->
<jvmarg value="-Dtest.ini.file=${target.dir}/luni/resources/config/localhosttest.ini" />
Modified: harmony/enhanced/classlib/trunk/modules/logging/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/logging/build.xml?rev=776762&r1=776761&r2=776762&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/logging/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/logging/build.xml Wed May 20 16:49:07 2009
@@ -168,6 +168,9 @@
<property name="test.jre.home" value="${hy.jdk}/jre" />
+ <copy file="../../support/src/test/resources/config/testing.policy"
+ todir="${hy.hdk}/build/test" outputencoding="UTF-8" />
+
<junit fork="yes"
forkmode="${hy.test.forkmode}"
timeout="${hy.test.timeout}"
@@ -187,7 +190,7 @@
<jvmarg value="-Dhy.test.vmargs=${hy.test.vmargs}" />
<!-- Required by various tests that set security manager etc -->
- <jvmarg value="-Djava.security.policy=../../support/src/test/resources/config/testing.policy" />
+ <jvmarg value="-Djava.security.policy=${hy.hdk}/build/test/testing.policy" />
<jvmarg value="-Xbootclasspath/a:${hy.logging.bin.internal}"/>
Modified: harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/build.xml?rev=776762&r1=776761&r2=776762&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/build.xml Wed May 20 16:49:07 2009
@@ -320,7 +320,7 @@
<mkdir dir="${tests.resources.hdk.dir}/config"/>
<copy file="../../support/src/test/resources/config/testing.policy"
- todir="${tests.resources.hdk.dir}/config"/>
+ todir="${hy.hdk}/build/test" outputencoding="UTF-8" />
<copy file="../../support/src/test/resources/config/localhosttest.ini"
todir="${tests.resources.hdk.dir}/config"/>
@@ -535,7 +535,7 @@
<jvmarg value="-Dhy.test.vmargs=${hy.test.vmargs}" />
<!-- Required by various tests that set security manager etc -->
- <jvmarg value="-Djava.security.policy=../../support/src/test/resources/config/testing.policy" />
+ <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" />