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 2010/10/26 16:41:49 UTC
svn commit: r1027580 - in /harmony/enhanced/java/branches/java6: ./
classlib/ classlib/depends/libs/ drlvm/ jdktools/
jdktools/modules/jdktools/ jdktools/modules/jdktools/src/test/java/common/
jdktools/modules/jdktools/src/test/java/common/org/ jdktool...
Author: hindessm
Date: Tue Oct 26 14:41:48 2010
New Revision: 1027580
URL: http://svn.apache.org/viewvc?rev=1027580&view=rev
Log:
Merge change from /harmony/enhanced/java/trunk@1022493:
r1022493 | hindessm | 2010-10-14 13:38:04 +0100 (Thu, 14 Oct 2010) | 3 lines
Create platform-specific tree to facilitate windows specific tests
required for HARMONY-6620 (javaw test).
Added:
harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/src/test/java/common/
- copied from r1022493, harmony/enhanced/java/trunk/jdktools/modules/jdktools/src/test/java/common/
harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/src/test/java/common/org/
- copied from r1022493, harmony/enhanced/java/trunk/jdktools/modules/jdktools/src/test/java/common/org/
harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/src/test/java/common/org/apache/
- copied from r1022493, harmony/enhanced/java/trunk/jdktools/modules/jdktools/src/test/java/common/org/apache/
harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/src/test/java/common/org/apache/harmony/
- copied from r1022493, harmony/enhanced/java/trunk/jdktools/modules/jdktools/src/test/java/common/org/apache/harmony/
harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/src/test/java/common/org/apache/harmony/tests/
- copied from r1022493, harmony/enhanced/java/trunk/jdktools/modules/jdktools/src/test/java/common/org/apache/harmony/tests/
harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/src/test/java/common/org/apache/harmony/tests/tools/
- copied from r1022493, harmony/enhanced/java/trunk/jdktools/modules/jdktools/src/test/java/common/org/apache/harmony/tests/tools/
harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/src/test/java/common/org/apache/harmony/tests/tools/javac/
- copied from r1022493, harmony/enhanced/java/trunk/jdktools/modules/jdktools/src/test/java/common/org/apache/harmony/tests/tools/javac/
harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/src/test/java/common/org/apache/harmony/tests/tools/javac/MainTest.java
- copied unchanged from r1022493, harmony/enhanced/java/trunk/jdktools/modules/jdktools/src/test/java/common/org/apache/harmony/tests/tools/javac/MainTest.java
harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/src/test/java/common/org/apache/harmony/tests/tools/javah/
- copied from r1022493, harmony/enhanced/java/trunk/jdktools/modules/jdktools/src/test/java/common/org/apache/harmony/tests/tools/javah/
harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/src/test/java/common/org/apache/harmony/tests/tools/javah/Test/
- copied from r1022493, harmony/enhanced/java/trunk/jdktools/modules/jdktools/src/test/java/common/org/apache/harmony/tests/tools/javah/Test/
harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/src/test/java/common/org/apache/harmony/tests/tools/javah/Test/Test01.java
- copied unchanged from r1022493, harmony/enhanced/java/trunk/jdktools/modules/jdktools/src/test/java/common/org/apache/harmony/tests/tools/javah/Test/Test01.java
harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/src/test/java/common/org/apache/harmony/tests/tools/javah/Test02.java
- copied unchanged from r1022493, harmony/enhanced/java/trunk/jdktools/modules/jdktools/src/test/java/common/org/apache/harmony/tests/tools/javah/Test02.java
harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/src/test/java/common/org/apache/harmony/tests/tools/serialver/
- copied from r1022493, harmony/enhanced/java/trunk/jdktools/modules/jdktools/src/test/java/common/org/apache/harmony/tests/tools/serialver/
harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/src/test/java/common/org/apache/harmony/tests/tools/serialver/NoSerialize.java
- copied unchanged from r1022493, harmony/enhanced/java/trunk/jdktools/modules/jdktools/src/test/java/common/org/apache/harmony/tests/tools/serialver/NoSerialize.java
harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/src/test/java/common/org/apache/harmony/tests/tools/serialver/Point.java
- copied unchanged from r1022493, harmony/enhanced/java/trunk/jdktools/modules/jdktools/src/test/java/common/org/apache/harmony/tests/tools/serialver/Point.java
harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/src/test/java/common/org/apache/harmony/tests/tools/serialver/Test.java
- copied unchanged from r1022493, harmony/enhanced/java/trunk/jdktools/modules/jdktools/src/test/java/common/org/apache/harmony/tests/tools/serialver/Test.java
harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/src/test/java/common/org/apache/harmony/tools/
- copied from r1022493, harmony/enhanced/java/trunk/jdktools/modules/jdktools/src/test/java/common/org/apache/harmony/tools/
harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/src/test/java/common/org/apache/harmony/tools/keytool/
- copied from r1022493, harmony/enhanced/java/trunk/jdktools/modules/jdktools/src/test/java/common/org/apache/harmony/tools/keytool/
harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/src/test/java/common/org/apache/harmony/tools/keytool/tests/
- copied from r1022493, harmony/enhanced/java/trunk/jdktools/modules/jdktools/src/test/java/common/org/apache/harmony/tools/keytool/tests/
harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/src/test/java/common/org/apache/harmony/tools/toolutils/
- copied from r1022493, harmony/enhanced/java/trunk/jdktools/modules/jdktools/src/test/java/common/org/apache/harmony/tools/toolutils/
harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/src/test/java/common/org/apache/harmony/tools/toolutils/tests/
- copied from r1022493, harmony/enhanced/java/trunk/jdktools/modules/jdktools/src/test/java/common/org/apache/harmony/tools/toolutils/tests/
harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/src/test/java/common/org/apache/harmony/tools/toolutils/tests/KeyStoreLoaderSaverTest.java
- copied unchanged from r1022493, harmony/enhanced/java/trunk/jdktools/modules/jdktools/src/test/java/common/org/apache/harmony/tools/toolutils/tests/KeyStoreLoaderSaverTest.java
harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/src/test/java/unix/
- copied from r1022493, harmony/enhanced/java/trunk/jdktools/modules/jdktools/src/test/java/unix/
harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/src/test/java/windows/
- copied from r1022493, harmony/enhanced/java/trunk/jdktools/modules/jdktools/src/test/java/windows/
Removed:
harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/src/test/java/org/
Modified:
harmony/enhanced/java/branches/java6/ (props changed)
harmony/enhanced/java/branches/java6/classlib/ (props changed)
harmony/enhanced/java/branches/java6/classlib/depends/libs/ (props changed)
harmony/enhanced/java/branches/java6/drlvm/ (props changed)
harmony/enhanced/java/branches/java6/jdktools/ (props changed)
harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/build.xml
Propchange: harmony/enhanced/java/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 26 14:41:48 2010
@@ -1,4 +1,4 @@
/harmony/enhanced/java/branches/mrh:935751-941490
-/harmony/enhanced/java/trunk:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971,1002988,1002990,1003089,1003094-1003095,1003109,1003513,1003744,1004471,1004624,1004837,1004906,1004908,1005084,1005391,1005441-1005442,1005648,1005651,1006115,1021745,1022064,1022390
+/harmony/enhanced/java/trunk:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971,1002988,1002990,1003089,1003094-1003095,1003109,1003513,1003744,1004471,1004624,1004837,1004906,1004908,1005084,1005391,1005441-1005442,1005648,1005651,1006115,1021745,1022064,1022390,1022493
/harmony/enhanced/trunk:476395-929252
/incubator/harmony/enhanced/trunk:292550-476394
Propchange: harmony/enhanced/java/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 26 14:41:48 2010
@@ -1,7 +1,7 @@
/harmony/enhanced/classlib/trunk:713674-735919,765923-926091,926318-926838
/harmony/enhanced/classlib/trunk/working_classlib:884014-884286
/harmony/enhanced/java/branches/mrh/classlib:935751-941490
-/harmony/enhanced/java/trunk/classlib:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971,1002988,1002990,1003089,1003094-1003095,1003109,1003513,1003744,1004471,1004624,1004837,1004906,1004908,1005084,1005391,1005441-1005442,1005648,1005651,1006115,1021745,1022064,1022390
+/harmony/enhanced/java/trunk/classlib:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971,1002988,1002990,1003089,1003094-1003095,1003109,1003513,1003744,1004471,1004624,1004837,1004906,1004908,1005084,1005391,1005441-1005442,1005648,1005651,1006115,1021745,1022064,1022390,1022493
/harmony/enhanced/trunk/classlib:476395-929252
/harmony/enhanced/trunk/working_classlib:476396-920147
/incubator/harmony/enhanced/trunk/classlib:292550-476394
Propchange: harmony/enhanced/java/branches/java6/classlib/depends/libs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 26 14:41:48 2010
@@ -1,4 +1,4 @@
/harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/java/trunk/classlib/depends/libs:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971,1002988,1002990,1003089,1003094-1003095,1003109,1003513,1003744,1004471,1004624,1004837,1004906,1004908,1005084,1005391,1005441-1005442,1005648,1005651,1006115,1021745,1022064,1022390
+/harmony/enhanced/java/trunk/classlib/depends/libs:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971,1002988,1002990,1003089,1003094-1003095,1003109,1003513,1003744,1004471,1004624,1004837,1004906,1004908,1005084,1005391,1005441-1005442,1005648,1005651,1006115,1021745,1022064,1022390,1022493
/harmony/enhanced/trunk/classlib/depends/libs:476395-929252
/incubator/harmony/enhanced/trunk/classlib/depends/libs:292550-476394
Propchange: harmony/enhanced/java/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 26 14:41:48 2010
@@ -1,5 +1,5 @@
/harmony/enhanced/java/branches/mrh/drlvm:935751-941490
-/harmony/enhanced/java/trunk/drlvm:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971,1002988,1002990,1003089,1003094-1003095,1003109,1003513,1003744,1004471,1004624,1004837,1004906,1004908,1005084,1005391,1005441-1005442,1005648,1005651,1006115,1021745,1022064,1022390
+/harmony/enhanced/java/trunk/drlvm:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971,1002988,1002990,1003089,1003094-1003095,1003109,1003513,1003744,1004471,1004624,1004837,1004906,1004908,1005084,1005391,1005441-1005442,1005648,1005651,1006115,1021745,1022064,1022390,1022493
/harmony/enhanced/trunk/drlvm:476395-929252
/harmony/enhanced/trunk/working_vm:476396-920147
/incubator/harmony/enhanced/trunk/drlvm:292550-476394
Propchange: harmony/enhanced/java/branches/java6/jdktools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 26 14:41:48 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971,1002988,1002990,1003089,1003094-1003095,1003109,1003513,1003744,1004471,1004624,1004837,1004906,1004908,1005084,1005391,1005441-1005442,1005648,1005651,1006115,1021745,1022064,1022390
+/harmony/enhanced/java/trunk/jdktools:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971,1002988,1002990,1003089,1003094-1003095,1003109,1003513,1003744,1004471,1004624,1004837,1004906,1004908,1005084,1005391,1005441-1005442,1005648,1005651,1006115,1021745,1022064,1022390,1022493
/harmony/enhanced/jdktools/trunk:630107-925933
/harmony/enhanced/trunk/jdktools:476395-929252
/harmony/enhanced/trunk/working_jdktools:476396-920147
Modified: harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/build.xml?rev=1027580&r1=1027579&r2=1027580&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/build.xml (original)
+++ harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/build.xml Tue Oct 26 14:41:48 2010
@@ -194,7 +194,8 @@
<compile-tests description="${hy.module} tests">
<javac-elements>
<src>
- <pathelement location="src/test/java" />
+ <pathelement location="src/test/java/common" />
+ <pathelement location="src/test/java/${hy.os.family}" />
</src>
<exclude name="org/apache/harmony/tests/tools/serialver/**"
if="is.select"/>