Mercurial > hg > icedtea12
changeset 2375:bf3fe6f6ddf4
Update cacao patches to apply to updated OpenJDK sources
| author | Omair Majid <omajid@redhat.com> |
|---|---|
| date | Thu, 21 Apr 2011 13:20:10 -0400 |
| parents | 663791bf75c7 |
| children | 0f9261320112 |
| files | ChangeLog patches/cacao/ignore-tests.patch patches/cacao/launcher.patch |
| diffstat | 3 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Apr 21 13:09:00 2011 -0400 +++ b/ChangeLog Thu Apr 21 13:20:10 2011 -0400 @@ -1,3 +1,8 @@ +2011-04-21 Omair Majid <omajid@redhat.com> + + * patches/cacao/ignore-tests.patch: Update to apply on new sources. + * patches/cacao/launcher.patch: Likewise. + 2011-04-21 Omair Majid <omajid@redhat.com> * Makefile.am (clean-add-cacao): Fix typo.
--- a/patches/cacao/ignore-tests.patch Thu Apr 21 13:09:00 2011 -0400 +++ b/patches/cacao/ignore-tests.patch Thu Apr 21 13:20:10 2011 -0400 @@ -2,7 +2,7 @@ --- openjdk.orig/jdk/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java 2010-05-10 15:04:14.000000000 +0100 +++ openjdk/jdk/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java 2010-05-10 23:42:41.000000000 +0100 @@ -37,6 +37,7 @@ - * @compile ProducerConsumerLoops.java + * @compile -source 1.5 ProducerConsumerLoops.java * @run main/timeout=3600 ProducerConsumerLoops * @summary multiple producers and consumers using blocking queues + * @ignore cacao test hog, ignore for the sake of buildds
--- a/patches/cacao/launcher.patch Thu Apr 21 13:09:00 2011 -0400 +++ b/patches/cacao/launcher.patch Thu Apr 21 13:20:10 2011 -0400 @@ -30,7 +30,7 @@ args.argc = argc; @@ -1931,7 +1935,17 @@ - args.classname = classname; + args.what = what; args.ifn = *ifn; - rslt = ContinueInNewThread0(JavaMain, threadStackSize, (void*)&args);