Danesh Dadachanji | 10 Feb 23:10
Picon
Favicon

[RFC][icedtea-web] Path to NEW_LINE_IFS is incorrect

Hi,

The var abs_top_builddir is used as the path to NEW_LINE_IFS when it 
should be abs_top_srcdir. When building outside of src dir (e.g. in 
icedtea-web/build with ../configure), this will fail when running say 
'make run-netx-dist-tests'. It mustn't have been caught yet because 
people are probably building in the src dir directly when testing..

ChangeLog:
+2012-02-10  Danesh Dadachanji  <ddadacha@...>
+
+	Fix path to NEW_LINE_IFS for when one builds outside of src directory.
+	* Makefile.am: Use top src directory instead of top build directory
+	for NEW_LINE_IFS
+

Is the attached patch okay for HEAD and 1.2?

Cheers,
Danesh
diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -475,7 +475,7 @@ junit-jnlp-dist-signed.txt:
 stamps/netx-dist-tests-prepare-reproducers.stamp: stamps/junit-jnlp-dist-dirs
 	types=(simple signed); \
 	for which in "$${types[@]}" ; do \
-	  . $(abs_top_builddir)/NEW_LINE_IFS ; \
+	  . $(abs_top_srcdir)/NEW_LINE_IFS ; \
 	  simpleReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-$$which.txt `); \
 	  IFS="$$IFS_BACKUP" ; \
 	  for dir in "$${simpleReproducers[@]}" ; do \
@@ -503,7 +503,7 @@ stamps/netx-dist-tests-sign-some-reprodu
 	keystore=$(abs_top_builddir)/$(KEYSTORE_NAME); \
 	pass=123456789; \
 	$(BOOT_DIR)/bin/keytool -genkey -alias $$alias -keystore $$keystore -keypass $$pass -storepass
$$pass -dname "cn=$$alias, ou=$$alias, o=$$alias, c=$$alias" ; \
-	  . $(abs_top_builddir)/NEW_LINE_IFS ; \
+	  . $(abs_top_srcdir)/NEW_LINE_IFS ; \
 	signedReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-signed.txt `); \
 	  IFS="$$IFS_BACKUP" ; \
 	for dir in "$${signedReproducers[@]}" ; do \
@@ -528,7 +528,7 @@ stamps/netx-dist-tests-compile-testcases
  netx-dist-tests-source-files.txt stamps/netx-dist-tests-compile.stamp
 	types=(simple signed); \
 	for which in "$${types[@]}" ; do \
-	  . $(abs_top_builddir)/NEW_LINE_IFS ; \
+	  . $(abs_top_srcdir)/NEW_LINE_IFS ; \
 	  simpleReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-$$which.txt `); \
 	  IFS="$$IFS_BACKUP" ; \
 	  for dir in "$${simpleReproducers[@]}" ; do \
@@ -677,7 +677,7 @@ if WITH_EMMA
 	k=0 ; \
 	types=(simple signed); \
 	for which in "$${types[@]}" ; do \
-	  . $(abs_top_builddir)/NEW_LINE_IFS ; \
+	  . $(abs_top_srcdir)/NEW_LINE_IFS ; \
 	  simpleReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-$$which.txt `); \
 	  IFS="$$IFS_BACKUP" ; \
 	  for dir in "$${simpleReproducers[@]}" ; do \
@@ -740,7 +740,7 @@ if WITH_EMMA
 	k=0 ; \
 	types=(simple signed); \
 	for which in "$${types[@]}" ; do \
-	  . $(abs_top_builddir)/NEW_LINE_IFS ; \
+	  . $(abs_top_srcdir)/NEW_LINE_IFS ; \
 	  simpleReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-$$which.txt `); \
 	  IFS="$$IFS_BACKUP" ; \
 	  for dir in "$${simpleReproducers[@]}" ; do \

Gmane