In message <[email protected]>, Oliver Deakin writes:
>
> Hi all,
>
> I've just run the classlib tests on Windows x86 on the latest code in
> the federated build and I don't see anything catastrophic there. There's
> 1 failure in the portlib tests, in hymmap, which I think is a test case
> off-by-one error. I've attached a patch [1] which fixes the test. Apart
> from that we look clean.
>
> Does anyone have any other test reports? Any other platforms? I'm
> assuming we're taking r778555 as our testing base for M10.
I think we said we were going to test building from source this time
around so I'm testing that:
ant bundle-src
tar xzf target/apache-harmony-src-r778555-snapshot.tar.gz
cd apache-harmony-src-r778555
ant fetch-depends snapshot
ant -Dtest.jre.home=$PWD/target/hdk/jdk/jre -f working_classlib/build.xml test
works on Linux. We need to check that this builds a sane binary
snapshot with the correct version information in the various jars, etc.
I'll report back once my test run is complete.
Oliver, regarding your patch below, since the + 1 is for the trailing \0
(rather than the separator) perhaps we should move it to the end of the
sum rather than have it in the middle?
Regards,
Mark.
> Regards,
> Oliver
>
> [1]
> Adding 2 to the path size for emptyFile and testFile is incorrect, as
> pathLen already counts the rightmost DIR_SEPARATOR.
>
> Index: modules/portlib/src/test/native/hymmap/shared/hymmap.c
> ===================================================================
> --- modules/portlib/src/test/native/hymmap/shared/hymmap.c (revision
> 779066)
> +++ modules/portlib/src/test/native/hymmap/shared/hymmap.c (working copy)
> @@ -126,8 +126,8 @@
> execName = strrchr(execPath, DIR_SEPARATOR) + 1; /* Find the
> rightmost slash character */
> pathLen = strlen(execPath) - strlen(execName);
>
> - emptyFile = hyportLibrary->mem_allocate_memory(hyportLibrary,
> pathLen + strlen("shared") + 2 + strlen("emptyFile")); /* +2 for the
> extra slash and null terminator */
> - testFile = hyportLibrary->mem_allocate_memory(hyportLibrary,
> pathLen + strlen("shared") + 2 + strlen("testFile"));
> + emptyFile = hyportLibrary->mem_allocate_memory(hyportLibrary,
> pathLen + strlen("shared") + 1 + strlen("emptyFile")); /* +1 for the
> null terminator */
> + testFile = hyportLibrary->mem_allocate_memory(hyportLibrary,
> pathLen + strlen("shared") + 1 + strlen("testFile"));
>
> strncpy(emptyFile, execPath, pathLen);
> strcat(emptyFile, "shared");