summaryrefslogtreecommitdiffstats
path: root/archive
Commit message (Collapse)AuthorAgeFilesLines
* Remove useless annotation cruft from tests for: annotation, archive, ↵Elliott Hughes2010-02-2219-1075/+6
| | | | | | concurrent, and suncompat. 22 files (and 4 modules) down, 1000 to go...
* Resync a load of tests with upstream, make our build faster.Elliott Hughes2010-02-1914-3724/+2771
| | | | | | | | | | | | | | | | | | | | | | | | | | | I started off with a mission to remove uses of dalvik.annotation.* (stuff like @TestTargetNew and other useless junk that just makes it harder to stay in sync with upstream). I wrote a script to go through tests showing me the diff between what we have and what upstream has, thinking that in cases where upstream has also added tests, I may as well pull them in at the same time... ...but I didn't realize how close we were to having dx fill its 1.5GiB heap. After trying various alternatives, I decided to bite the bullet and break core-tests up into one .jar per module. This adds parallelism back into this, the slowest part of our build. (I can do even better, but I'll do that in a separate patch, preferably after we've merged recent changes from master.) Only a couple of dependencies were problematic: the worthless TestSuiteFactory which already contained a comment suggesting we get rid of it, and the fact that some tests -- most notably the concurrent ones -- also contained main methods that started the JUnit tty-based TestRunner. (In the long run, we want to be running the harmony tests directly from a pristine "svn co" of upstream, using DalvikRunner. But this will be a big help in the meantime, and starts the work of getting our current copy of the tests into a state where we can start to extract any meaningful changes/additions we've made.)
* Track upstream fixes to two broken tests.Elliott Hughes2010-02-051-18/+27
|
* Fix accidental API pollution in java.util.zip.Elliott Hughes2010-02-054-25/+29
| | | | | | | | | | | | | Package-private interface ZipConstants turns out to be implemented by all the public Zip* classes in the package, so they can uselessly expose duplicate copies of the constants. This means I can't add my own constants there because they'll leak. This didn't break the build because we lose the "implements ZipConstants" and ZipConstants.class somewhere around the apicheck part of the build. See http://b/2421864 for that. Anyway, let's mop up the spill before anyone can see it...
* Fix decoding of filenames in zip files, when read by ZipFile.Elliott Hughes2010-02-044-19/+40
| | | | | | | | | | | | | Java always writes UTF-8 filenames in zip files, but harmony cunningly always reads them back as ISO-8859-1. Fix that, and also set the flag that says "these filenames are UTF-8" (the RI will do this from Java 7 on). Note that this patch doesn't actually touch ZipFile because the bug is in the package-private ZipEntry constructor that's used by ZipFile.readCentralDirectory. Bug: http://code.google.com/p/android/issues/detail?id=4690
* Remove obviously bogus @KnownFailure annotations.Elliott Hughes2010-02-032-3/+0
| | | | | | | | | | | | | | We've already agreed @KnownFailure Must Die (to be replaced by expectations for DalvikRunner), but some are -- I think -- obviously in need of investigation. This patch removes @KnownFailure for all cases where the reason looks bogus. I've left the @KnownFailure annotations in cases where I it looks "reasonable" in that we simply haven't implemented the functionality (pack200, say), and a few other cases. Those should probably be done in a separate patch that adds expectations at the same time. But these ones, I think, all need investigating. (There's a scary number of Arabic-related bugs in here, given that we're supposed to be shipping Arabic in froyo.)
* Merge branch 'archive_888752' into archive_dalvikJesse Wilson2009-12-0934-886/+593
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libcore/archive/build.xml libcore/archive/src/main/java/java/util/jar/JarFile.java libcore/archive/src/main/java/java/util/zip/GZIPInputStream.java libcore/archive/src/main/java/java/util/zip/Inflater.java libcore/archive/src/main/java/java/util/zip/InflaterInputStream.java libcore/archive/src/main/java/java/util/zip/ZipEntry.java libcore/archive/src/main/java/java/util/zip/ZipFile.java libcore/archive/src/main/java/java/util/zip/ZipInputStream.java libcore/archive/src/main/java/org/apache/harmony/archive/internal/nls/Messages.java libcore/archive/src/main/java/org/apache/harmony/archive/internal/nls/messages.properties libcore/archive/src/main/native/archive/unix/exports.txt libcore/archive/src/main/native/archive/unix/makefile libcore/archive/src/main/native/archive/windows/makefile libcore/archive/src/main/native/archive_copyright.c libcore/archive/src/main/native/jarfile.c libcore/archive/src/main/native/java_util_zip_Deflater.c libcore/archive/src/main/native/zip.c libcore/archive/src/main/native/zipcache.c libcore/archive/src/main/native/zlib/unix/makefile libcore/archive/src/main/native/zlib/windows/makefile libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/AllTests.java libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarFileTest.java libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarInputStreamTest.java libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarOutputStreamTest.java libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/ManifestTest.java libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/Pack200Test.java libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/DeflaterOutputStreamTest.java libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterInputStreamTest.java libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterTest.java libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipEntryTest.java libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipFileTest.java libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipInputStreamTest.java
* Clean up sieb.[ch], including changing a reference to <malloc.h> to insteadDan Bornstein2009-11-052-27/+48
| | | | | | | | | | be the more standard <stdlib.h>. I have no idea what "sieb" means (stands for?), and it looks like these files may want to be placed in the nearest recycling receptacle, but I'm not ready to go there today. Change-Id: I2d4116b742e61018fdbea127070154545ff82dbd
* A new hygenic way for tests to clean up before or after execution.Jesse Wilson2009-10-251-2/+2
| | | | This replaces PrefsTester and is more general purpose.
* Respond to impossible CloneNotSupportedExceptions with AssertionErrors.Jesse Wilson2009-10-161-1/+1
| | | | See bug 2183132.
* am 8673ee75: am 9a35ef1b: Guarantee deflaters get cleaned up, even if ↵Jesse Wilson2009-10-151-1/+8
|\ | | | | | | | | | | | | | | | | subclassed. Merge commit '8673ee75052e7398aa6f5925e968d6a0b2419be8' * commit '8673ee75052e7398aa6f5925e968d6a0b2419be8': Guarantee deflaters get cleaned up, even if subclassed.
| * Guarantee deflaters get cleaned up, even if subclassed.Jesse Wilson2009-10-151-1/+8
| | | | | | | | See bug 2186927
* | Rewrite Support_Exec to support timeouts on waiting processes.Jesse Wilson2009-10-094-110/+88
| | | | | | | | | | | | Also rewriting SupportExec to use ProcessBuilder rather than Runtime.exec(). Changed callers to use the ProcessBuilder directly rather than calling-through chained methods.
* | Update archive to Harmony r820767.Jesse Wilson2009-10-011-13/+1
| |
* | Adding checks for already-closed ZIP files.Jesse Wilson2009-09-202-41/+54
| | | | | | | | See bug 1635955.
* | am 40e5e99e: am 7f331f3e: Fixing available() and close() for archive streams.Jesse Wilson2009-09-188-133/+194
|\ \ | |/ | | | | | | | | | | Merge commit '40e5e99e5d19b9f2ff4cd26deeb141bc3d7f9df9' * commit '40e5e99e5d19b9f2ff4cd26deeb141bc3d7f9df9': Fixing available() and close() for archive streams.
| * Fixing available() and close() for archive streams.Jesse Wilson2009-09-188-133/+194
| | | | | | | | | | | | | | This builds on work originally submitted to Harmony: http://issues.apache.org/jira/browse/HARMONY-6210 The approach is to change available() to eagerly set eof to true, rather than waiting for a read to fail.
* | am 17e591c5: am df60455b: Merge change 25126 into eclairJesse Wilson2009-09-187-70/+109
|\ \ | |/ | | | | | | | | | | Merge commit '17e591c55554fc291fb8bd8a00bfdff0d6e46d11' * commit '17e591c55554fc291fb8bd8a00bfdff0d6e46d11': Update archive to the r802921 from Harmony.
| * Merge change 25126 into eclairAndroid (Google) Code Review2009-09-167-70/+109
| |\ | | | | | | | | | | | | * changes: Update archive to the r802921 from Harmony.
| | * Update archive to the r802921 from Harmony.Jesse Wilson2009-09-167-70/+109
| | | | | | | | | | | | | | | This overdue update includes fixes for some Eclair bugs that I originally submitted to Harmony: 1876785, 1635982, 1635998
* | | Merge change 25532Android (Google) Code Review2009-09-171-1/+0
|\ \ \ | | | | | | | | | | | | | | | | * changes: Don't throw OutOfMemoryError if it's already been thrown.
| * | | Don't throw OutOfMemoryError if it's already been thrown.Elliott Hughes2009-09-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | If GetPrimitiveArrayCritical fails, it throws a suitable exception for us. Also remove dead code.
* | | | am 880e713e: am e937b1b2: Merge change 24110 into eclairUrs Grob2009-09-172-10/+67
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | Merge commit '880e713e4811ab933571e722f5d84354baf42bae' * commit '880e713e4811ab933571e722f5d84354baf42bae': JarFile was not able to verify signed files with size 0.
| * | JarFile was not able to verify signed files with size 0.Urs Grob2009-09-072-10/+67
| |/ | | | | | | | | | | This regressen was introduced by harmony optimizations done in HARMONY-4569. This fix allows for jar entries of size 0 to also get successfully validated. A regression test has been added to JarFileTest.
* | Merge change 24610Android (Google) Code Review2009-09-112-13/+4
|\ \ | | | | | | | | | | | | * changes: Several small native code fixes.
| * | Several small native code fixes.Elliott Hughes2009-09-102-13/+4
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Don't throw OutOfMemoryError manually in Adler32/CRC32: the VM does that for us if GetPrimitiveArrayCritical needs, but fails, to allocate memory. * Don't use anything but NULL for the "iscopy" argument to Get*ArrayElements. The other users of this argument (removed earlier this week) were under the mistaken impression that it's an "in" parameter rather than an "out" parameter, and since these remaining callers aren't actually using the result, let's remove the cruft. * Move the null check in harmony_io_openImpl for "path" to come *before* the first dereference. * Make harmony_io_ttyReadImpl just delegate to harmony_io_readImpl since, apart from the zero-length read check, they were identical. * Remove the dead function throwIOExceptionStr from the OpenSSLSessionImpl native code. Tested on sapphire-eng.
* | Fix unnecessary GetPrimitiveArrayCritical users.Elliott Hughes2009-09-092-35/+16
|/ | | | | | Tested on sapphire-eng. Bug: 1639287
* Updating archive to Harmony r772995.Jesse Wilson2009-06-0953-1853/+2116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: Adding @TestTargetNew tags Initial merge of branch 'archive_772995' into archive_dalvik. Fixed some problems, including InflaterInputStream.available() and JarFile.skip() bugs. Conflicts: libcore/archive/.classpath libcore/archive/META-INF/MANIFEST.MF libcore/archive/build.xml libcore/archive/make/hyproperties.xml libcore/archive/src/main/java/java/util/jar/Attributes.java libcore/archive/src/main/java/java/util/jar/JarEntry.java libcore/archive/src/main/java/java/util/jar/JarException.java libcore/archive/src/main/java/java/util/jar/JarFile.java libcore/archive/src/main/java/java/util/jar/JarInputStream.java libcore/archive/src/main/java/java/util/jar/JarVerifier.java libcore/archive/src/main/java/java/util/jar/Manifest.java libcore/archive/src/main/java/java/util/jar/Pack200.java libcore/archive/src/main/java/java/util/zip/Adler32.java libcore/archive/src/main/java/java/util/zip/CRC32.java libcore/archive/src/main/java/java/util/zip/Checksum.java libcore/archive/src/main/java/java/util/zip/DataFormatException.java libcore/archive/src/main/java/java/util/zip/Deflater.java libcore/archive/src/main/java/java/util/zip/DeflaterOutputStream.java libcore/archive/src/main/java/java/util/zip/GZIPInputStream.java libcore/archive/src/main/java/java/util/zip/GZIPOutputStream.java libcore/archive/src/main/java/java/util/zip/Inflater.java libcore/archive/src/main/java/java/util/zip/InflaterInputStream.java libcore/archive/src/main/java/java/util/zip/ZipEntry.java libcore/archive/src/main/java/java/util/zip/ZipException.java libcore/archive/src/main/java/java/util/zip/ZipFile.java libcore/archive/src/main/java/java/util/zip/ZipInputStream.java libcore/archive/src/main/java/java/util/zip/ZipOutputStream.java libcore/archive/src/main/java/org/apache/harmony/archive/internal/nls/Messages.java libcore/archive/src/main/native/archive/shared/archiveglob.c libcore/archive/src/main/native/archive/shared/jarfile.c libcore/archive/src/main/native/archive/shared/zip.c libcore/archive/src/main/native/archive/shared/zip.h libcore/archive/src/main/native/archive/unix/makefile libcore/archive/src/main/native/archive/windows/makefile libcore/archive/src/main/native/java_util_zip_Adler32.c libcore/archive/src/main/native/java_util_zip_CRC32.c libcore/archive/src/main/native/java_util_zip_Deflater.c libcore/archive/src/main/native/java_util_zip_Inflater.c libcore/archive/src/main/native/zip/shared/hyzip.nls libcore/archive/src/main/native/zip/unix/makefile libcore/archive/src/main/native/zipsup.h libcore/archive/src/main/native/zlib/unix/makefile libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/AttributesNameTest.java libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/AttributesTest.java libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarEntryTest.java libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarFileTest.java libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarInputStreamTest.java libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarOutputStreamTest.java libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/ManifestTest.java libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPInputStreamTest.java libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPOutputStreamTest.java libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterTest.java libcore/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipFileTest.java commit 946f165f5b592f4453fd8f2c19766921544d38dd Author: Jesse Wilson <jessewilson@google.com> Date: Tue May 12 15:12:55 2009 -0700 Strip @Since Android 1.0 from Archive commit 3498f216d7e826bfc9c4cc7c0da35830ca239367 Author: Jesse Wilson <jessewilson@google.com> Date: Tue May 12 15:09:05 2009 -0700 Dalvik archive commit 62e9db90bc6aa6b5d1c897cccdd616d812672677 Author: Jesse Wilson <jessewilson@google.com> Date: Tue May 12 15:07:51 2009 -0700 Archive 772995 commit d1bf618681d6badf1b50edaf204a083d3912213d Author: Jesse Wilson <jessewilson@google.com> Date: Tue May 12 15:06:36 2009 -0700 Archive 527399
* AI 145649: am: CL 145612 am: CL 145288 Removing tabs from tests.Urs Grob2009-04-091-1/+1
| | | | | | | | Original author: ursg Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 145649
* AI 144826: am: CL 144821 am: CL 144818 Bringing archive down to zero broken ↵Jorg Pleumann2009-04-071-7/+11
| | | | | | | | | | tests. Original author: jorgp Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 144826
* AI 143684: am: CL 143654 am: CL 143467 Bringing archive down to zero ↵Jorg Pleumann2009-03-313-11/+21
| | | | | | | | | | | | failures and zero broken tests. Original author: jorgp Merged from: //branches/cupcake/... Original author: android-build Merged from: //branches/donutburger/... Automated import of CL 143684
* auto import from //branches/cupcake_rel/...@140373The Android Open Source Project2009-03-183-26/+17
|
* auto import from //branches/cupcake/...@137873The Android Open Source Project2009-03-116-74/+67
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-0381-0/+23497
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-0381-23497/+0
|
* auto import from //branches/cupcake/...@132276The Android Open Source Project2009-02-191-16/+25
|
* auto import from //branches/cupcake/...@130745The Android Open Source Project2009-02-105-38/+365
|
* auto import from //branches/cupcake/...@125939The Android Open Source Project2009-01-0932-2729/+4829
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-1756-2958/+5641
|
* Initial ContributionThe Android Open Source Project2008-10-2175-0/+18378
generated by cgit v1.1 at 2025-03-21 04:43:01 +0000