/hg/icedtea6: Fix running jamvm jdk tests when configured with a...

[Dr Andrew John Hughes]

On 14:26 Fri 16 Dec     , Matthias Klose wrote:
> On 12/12/2011 07:12 PM, Andrew Haley wrote:
> > On 12/08/2011 02:49 PM, doko at icedtea.classpath.org wrote:
> >> changeset 96ea1d0f5dc4 in /hg/icedtea6
> >> details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=96ea1d0f5dc4
> >> author: doko at ubuntu.com
> >> date: Thu Dec 08 15:39:55 2011 +0100
> >>
> >> 	Fix running jamvm jdk tests when configured with a separate relative
> >> 	build dir
> >>
> >> 	2011-12-08 Matthias Klose <doko at ubuntu.com>
> >>
> >> 	 * Makefile.am (JTREG_SRCS): Use abs_top_srcdir.
> > 
> > This patch breaks "make dist":
> > 
> > cp: cannot stat `.//home/aph/iced-arm/icedtea6/jtreg': No such file or directory
> > make: *** [distdir] Error 1
> 
> currently testing the attached patch, not including any relative or absolute
> paths in EXTRA_DIST.
> 

Does make distcheck still work with this patch?  I haven't yet tried this patch
but the JTREG_SRCS and REWRITER_SRCS changes look like they will break builds
where srcdir != builddir.

As you seem to be adding $(top_srcdir) back in before JTREG_SRCS at almost every
point, it would seem a better fix to replace $(JTREG_SRCS) with 'jtreg' in EXTRA_DIST
instead - assuming it doesn't break make distcheck.

> diff -r 67df573b0734 Makefile.am
> --- a/Makefile.am	Mon Dec 12 18:01:38 2011 -0500
> +++ b/Makefile.am	Fri Dec 16 14:13:13 2011 +0100
> @@ -192,8 +192,8 @@
>  
>  # Sources list
>  
> -REWRITER_SRCS = $(top_srcdir)/rewriter/com/redhat/rewriter/ClassRewriter.java
> -JTREG_SRCS = $(abs_top_srcdir)/jtreg
> +REWRITER_SRCS = rewriter/com/redhat/rewriter/ClassRewriter.java
> +JTREG_SRCS = jtreg
>  
>  # Patch list
>  
> @@ -613,7 +613,7 @@
>  # FIXME (distclean): Add pulseaudio sources
>  
>  EXTRA_DIST = generated \
> -	$(top_srcdir)/patches/* \
> +	patches/* \
>  	contrib arm_port \
>  	overlays \
>  	jconsole.desktop policytool.desktop \
> @@ -1805,7 +1805,7 @@
>  if WITH_RHINO
>  	mkdir -p $(REWRITER_BUILD_DIR)
>  	$(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
> -	 -d $(REWRITER_BUILD_DIR) $(REWRITER_SRCS)
> +	 -d $(REWRITER_BUILD_DIR) $(top_srcdir)/$(REWRITER_SRCS)
>  endif
>  	mkdir -p stamps
>  	touch stamps/rewriter.stamp
> @@ -2121,8 +2121,8 @@
>  	rm -rf test/jtreg/classes
>  	mkdir -p test/jtreg/classes
>  	$(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d test/jtreg/classes \
> -	   -encoding iso-8859-1 `find $(JTREG_SRCS) -name '*.java'`
> -	(cd $(JTREG_SRCS); \
> +	   -encoding iso-8859-1 `find $(top_srcdir)/$(JTREG_SRCS) -name '*.java'`
> +	(cd $(top_srcdir)/$(JTREG_SRCS); \
>  	 $(BOOT_DIR)/bin/jar cfm $(abs_top_builddir)/test/jtreg.jar \
>  	   META-INF/MANIFEST.MF \
>  	   legal  README JavaTest.cmdMgrs.lst JavaTest.toolMgrs.lst \
> @@ -2174,7 +2174,7 @@
>  		-w:test/jdk/JTwork -r:test/jdk/JTreport \
>  		$${ICEDTEA_JTREG_OTHERVM:--samevm} \
>  		-jdk:$(BUILD_OUTPUT_DIR)/j2sdk-image \
> -		-exclude:$(JTREG_SRCS)/excludelist.jdk.jtx \
> +		-exclude:$(abs_top_srcdir)/$(JTREG_SRCS)/excludelist.jdk.jtx \
>  		$(ICEDTEA_JTREG_OPTIONS) \
>  		`pwd`/openjdk/jdk/test \
>  	    | tee test/$@.log


-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

PGP Key: 248BDC07 (https://keys.indymedia.org/)
Fingerprint = EC5A 1F5E C0AD 1D15 8F1F  8F91 3B96 A578 248B DC07
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20111219/be0a11ac/attachment.bin