You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by sm...@apache.org on 2007/08/30 14:32:19 UTC
svn commit: r571136 - in
/harmony/enhanced/buildtest/branches/2.0/tests/jedit_test: build.xml
jedit_test.build.properties readme.txt
Author: smishura
Date: Thu Aug 30 05:32:19 2007
New Revision: 571136
URL: http://svn.apache.org/viewvc?rev=571136&view=rev
Log:
Apply patch from HARMONY-4659:
([testing] JEdit automated GUI tests use obsolete workaround for java.awt.Toolkit)
Modified:
harmony/enhanced/buildtest/branches/2.0/tests/jedit_test/build.xml
harmony/enhanced/buildtest/branches/2.0/tests/jedit_test/jedit_test.build.properties
harmony/enhanced/buildtest/branches/2.0/tests/jedit_test/readme.txt
Modified: harmony/enhanced/buildtest/branches/2.0/tests/jedit_test/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/jedit_test/build.xml?rev=571136&r1=571135&r2=571136&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/jedit_test/build.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/jedit_test/build.xml Thu Aug 30 05:32:19 2007
@@ -54,13 +54,6 @@
<property name="patched.src.dir" location="${abbot.root}/psrc"/>
<property name="jedit.pl.install.dir" location="${jedit.install.dir}/jars"/>
- <!-- Check if we need to compile patch for Harmony -->
- <condition property="need.compile.harmony.patch">
- <not>
- <equals arg1="${harmony.boot.dir}" arg2=""/>
- </not>
- </condition>
-
<!-- =================================
target: public targets
================================= -->
@@ -106,7 +99,7 @@
- Junit framework 3.8.1 or higher from http://junit.org ('junit.jar' in your CLASSPATH).</echo>
</target>
- <target name="setup" depends="-install-depends, -compile.harmony.patch">
+ <target name="setup" depends="-install-depends">
<mkdir dir="${tests.classes.dir}"/>
<javac srcdir="${tests.src.dir}" destdir="${tests.classes.dir}"
excludes="**/patches/**">
@@ -126,13 +119,6 @@
<fail if="test.not.passed" />
</target>
- <target name="-compile.harmony.patch" if="need.compile.harmony.patch">
- <mkdir dir="${harmony.patched.classes.dir}"/>
- <javac srcdir="${patches.dir}/harmony" destdir="${harmony.patched.classes.dir}">
- <bootclasspath refid="patched-harmony-compile-classpath" />
- </javac>
- </target>
-
<target name="clean.report">
<delete dir="${tests.report.dir}" />
</target>
@@ -327,25 +313,6 @@
location="${abbot.root}/lib/junit.jar" />
</path>
- <path id="patched-harmony-compile-classpath">
- <pathelement
- location="${harmony.boot.dir}/luni-kernel-stubs.jar" />
- <pathelement
- location="${harmony.boot.dir}/security-kernel-stubs.jar" />
- <pathelement
- location="${harmony.boot.dir}/security.jar" />
- <pathelement
- location="${harmony.boot.dir}/luni.jar" />
- <pathelement
- location="${harmony.boot.dir}/beans.jar" />
- <pathelement
- location="${harmony.boot.dir}/annotation.jar" />
- <pathelement
- location="${harmony.boot.dir}/awt.jar" />
- <pathelement
- location="${harmony.boot.dir}/text.jar" />
- </path>
-
<path id="abbot-build-classpath">
<pathelement location="${abbot.root}/lib/junit.jar"/>
<pathelement location="${abbot.root}/lib/jdom.jar"/>
@@ -481,13 +448,12 @@
dir="${tests.working.dir}"
jvm="${test.java.home}/bin/java">
- <jvmarg line="${tested.vm.options}" />
+ <jvmarg line="${tested.vm.options} ${test.vmarg.bootclasspath}" />
<jvmarg value="-Djedit.home=${jedit.install.dir}" />
<jvmarg value="${test.vmarg.ush_prefix}" />
<jvmarg value="${test.vmarg.do_not_install_handler}" />
<jvmarg value="-DJEditStressTest.it_num=${test.stress.iterations}" />
- <jvmarg value="${test.vmarg.bootclasspath}" />
<jvmarg value="-Dtest.scripts.dir=${basedir}/scripts" />
<jvmarg value="-Dabbot.robot.popup_delay=${abbot.robot.popup_delay}" />
Modified: harmony/enhanced/buildtest/branches/2.0/tests/jedit_test/jedit_test.build.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/jedit_test/jedit_test.build.properties?rev=571136&r1=571135&r2=571136&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/jedit_test/jedit_test.build.properties (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/jedit_test/jedit_test.build.properties Thu Aug 30 05:32:19 2007
@@ -53,7 +53,7 @@
#test.vmarg.ush_prefix=
#test.vmarg.do_not_install_handler=
#
-test.vmarg.bootclasspath=-Xbootclasspath/p:${basedir}/${harmony.patched.classes.dir}
+test.vmarg.bootclasspath=
test.vmarg.ush_prefix=-Dabbot.util.url_stream_handler_prefix=org.apache.harmony.luni.internal.net.www.protocol
test.vmarg.do_not_install_handler=-Dabbot.util.do_not_install_handler=true
@@ -69,7 +69,6 @@
tests.src.dir=src
patches.dir=${tests.src.dir}/patches
jedit.settings.backup.dir=.jedit.backup
-harmony.patched.classes.dir=${classes.dir}/harmony
tests.classes.dir=${classes.dir}/tests
sf.download.url=http://prdownloads.sourceforge.net
Modified: harmony/enhanced/buildtest/branches/2.0/tests/jedit_test/readme.txt
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/jedit_test/readme.txt?rev=571136&r1=571135&r2=571136&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/jedit_test/readme.txt (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/jedit_test/readme.txt Thu Aug 30 05:32:19 2007
@@ -68,7 +68,6 @@
| | framework on Harmony's runtime*
| |
| +-- patch.txt - Patch for Abbot classes
- | +-- harmony/java/awt/Toolkit.java - Patch for Harmony
|
+-- scripts/ - Test scripts
|
@@ -82,9 +81,6 @@
*) These small patches are temporary.
Corresponding Abbot patch is on the project's web-page already:
http://sourceforge.net/tracker/index.php?func=detail&aid=1618017&group_id=50939&atid=461492
- Harmony's patch contains stub for nonimplemented method
- java.awt.Toolkit.getLockingKeyState and will be eliminated after
- the method implementation.
2. TOOLS REQUIRED FOR THE BUILD
@@ -113,16 +109,13 @@
through proxy uncomment and update with actual info two related lines in
the beginning of 'build.properties' file
-2) Set in 'build.properties' file directory where Harmony's jars located
- by modifying 'harmony.boot.dir' property
-
-3) Set/verify the values for the following environment variables:
+2) Set/verify the values for the following environment variables:
- PATH (Path on Windows) must contain the path to
patch utility executable, ant bin/ and J2SDK bin/ directories;
- junit.jar must be in CLASSPATH
-4) Build tests by executing the following commands:
+3) Build tests by executing the following commands:
cd <INSTALL_DIR>/jedit4.2_test
ant setup
@@ -141,7 +134,6 @@
+-- target/
+-- classes/
| |
- | +-- harmony - Compiled Harmony patch
| +-- tests - Compiled test classes
+-- downloads/ - Downloaded external dependencies
+-- abbot-1.0.0.rc5/ - Abbot framework (patched)
@@ -242,20 +234,16 @@
system. It must be replaced with "functional" one as soon as Harmony's
AWT/Swing implementation improved.
-3. There are patches for both Harmony's classes and Abbot framework in the
- archive. However they are temporary. Corresponding Abbot patch is on
- the project's web-page already:
+3. There are patches for Abbot framework in the archive. However they are
+ temporary. Corresponding Abbot patch is on the project's web-page already:
http://sourceforge.net/tracker/index.php?func=detail&aid=1618017&group_id=50939&atid=461492
- Harmony's patch contains stub for nonimplemented method in class
- java.awt.Toolkit and will be eliminated after the method implementation.
-
6. TODO
-------
-1. Eliminate Abbot/Harmony patches (see 3 in chapter 5 above).
+1. Eliminate Abbot patch (see 3 in chapter 5 above).
7. DISCLAIMER AND LEGAL INFORMATION