Index: tests/jedit_test/build.xml =================================================================== --- tests/jedit_test/build.xml (revision 551604) +++ tests/jedit_test/build.xml (working copy) @@ -54,13 +54,6 @@ - - - - - - - @@ -106,7 +99,7 @@ - Junit framework 3.8.1 or higher from http://junit.org ('junit.jar' in your CLASSPATH). - + @@ -126,13 +119,6 @@ - - - - - - - @@ -327,25 +313,6 @@ location="${abbot.root}/lib/junit.jar" /> - - - - - - - - - - - @@ -481,13 +448,12 @@ dir="${tests.working.dir}" jvm="${test.java.home}/bin/java"> - + - Index: tests/jedit_test/jedit_test.build.properties =================================================================== --- tests/jedit_test/jedit_test.build.properties (revision 551604) +++ tests/jedit_test/jedit_test.build.properties (working copy) @@ -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 Index: tests/jedit_test/readme.txt =================================================================== --- tests/jedit_test/readme.txt (revision 551604) +++ tests/jedit_test/readme.txt (working copy) @@ -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 +2) Set/verify the values for the following environment variables: -3) 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 /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