[PATCH REVIEW] [1.10] RFC: Make tests for java/javah/jar/native2ascii/rmic more stringent

[Deepak Bhole]

* Andrew John Hughes <ahughes at redhat.com> [2011-07-08 11:22]:
> I don't usually like making build changes on release branches, but
> I think this one is minor and useful enough to be worthy of consideration.
> 
> It checks that the values given for --with-java/jar/rmic/native2ascii/javah
> are files as well as being executables, preventing directories being allowed
> through and causing issues later (e.g. broken configure test results when
> ${JAVA} is used to run tests).
> 
> Ok for 1.10?
> 

Looks good to me, okay for 1.10.

I will look into it for icedtea-web, thanks!

Cheers,
Deepak

> I think 1.8 & 1.9 will require other changes too, so just 1.10 for this one.
> 
> IcedTea-Web folks, you might want to consider porting this one (or rather,
> the relevant chunks) over too.
> 
> ChangeLog:
> 
> Check that JDK binaries are files in addition to being executable.
> 
> 2011-06-29  Andrew John Hughes  <ahughes at redhat.com>
> 
> 	* acinclude.m4:
> 	(IT_FIND_JAVA): Check that the binary is also
> 	a regular file as well as executable.
> 	(IT_FIND_JAVAH): Likewise.
> 	(IT_FIND_JAR): Likewise.
> 	(IT_FIND_RMIC): Likewise.
> 	(IT_FIND_NATIVE2ASCII): Likewise.
> 
> -- 
> Andrew :)
> 
> Free Java Software Engineer
> Red Hat, Inc. (http://www.redhat.com)
> 
> Support Free Java!
> Contribute to GNU Classpath and IcedTea
> http://www.gnu.org/software/classpath
> http://icedtea.classpath.org
> PGP Key: F5862A37 (https://keys.indymedia.org/)
> Fingerprint = EA30 D855 D50F 90CD F54D  0698 0713 C3ED F586 2A37

> # HG changeset patch
> # User Andrew John Hughes <ahughes at redhat.com>
> # Date 1309367817 -3600
> # Node ID 6c21fc007867e718636767a2cbe1df8c02307958
> # Parent  15caf12fc26df836a387036ff70eec6875db9f9d
> Check that JDK binaries are files in addition to being executable.
> 
> 2011-06-29  Andrew John Hughes  <ahughes at redhat.com>
> 
> 	* acinclude.m4:
> 	(IT_FIND_JAVA): Check that the binary is also
> 	a regular file as well as executable.
> 	(IT_FIND_JAVAH): Likewise.
> 	(IT_FIND_JAR): Likewise.
> 	(IT_FIND_RMIC): Likewise.
> 	(IT_FIND_NATIVE2ASCII): Likewise.
> 
> diff -r 15caf12fc26d -r 6c21fc007867 ChangeLog
> --- a/ChangeLog	Fri Jul 08 16:13:57 2011 +0100
> +++ b/ChangeLog	Wed Jun 29 18:16:57 2011 +0100
> @@ -1,3 +1,13 @@
> +2011-06-29  Andrew John Hughes  <ahughes at redhat.com>
> +
> +	* acinclude.m4:
> +	(IT_FIND_JAVA): Check that the binary is also
> +	a regular file as well as executable.
> +	(IT_FIND_JAVAH): Likewise.
> +	(IT_FIND_JAR): Likewise.
> +	(IT_FIND_RMIC): Likewise.
> +	(IT_FIND_NATIVE2ASCII): Likewise.
> +
>  2011-06-28  Andrew John Hughes  <ahughes at redhat.com>
>  
>  	* Makefile.am: Add new patch.
> diff -r 15caf12fc26d -r 6c21fc007867 acinclude.m4
> --- a/acinclude.m4	Fri Jul 08 16:13:57 2011 +0100
> +++ b/acinclude.m4	Wed Jun 29 18:16:57 2011 +0100
> @@ -238,8 +238,8 @@
>    if test "x${JAVA}" = "xno"; then
>      JAVA=${JAVA_DEFAULT}
>    fi
> -  AC_MSG_CHECKING([if $JAVA is a valid executable])
> -  if test -x "${JAVA}"; then
> +  AC_MSG_CHECKING([if $JAVA is a valid executable file])
> +  if test -x "${JAVA}" && test -f "${JAVA}"; then
>      AC_MSG_RESULT([yes])
>    else
>      AC_MSG_RESULT([no])
> @@ -391,8 +391,8 @@
>    if test "x${JAVAH}" = "xno"; then
>      JAVAH=${JAVAH_DEFAULT}
>    fi
> -  AC_MSG_CHECKING([if $JAVAH is a valid executable])
> -  if test -x "${JAVAH}"; then
> +  AC_MSG_CHECKING([if $JAVAH is a valid executable file])
> +  if test -x "${JAVAH}" && test -f "${JAVAH}"; then
>      AC_MSG_RESULT([yes])
>    else
>      AC_MSG_RESULT([no])
> @@ -428,8 +428,8 @@
>    if test "x${JAR}" = "xno"; then
>      JAR=${JAR_DEFAULT}
>    fi
> -  AC_MSG_CHECKING([if $JAR is a valid executable])
> -  if test -x "${JAR}"; then
> +  AC_MSG_CHECKING([if $JAR is a valid executable file])
> +  if test -x "${JAR}" && test -f "${JAR}"; then
>      AC_MSG_RESULT([yes])
>    else
>      AC_MSG_RESULT([no])
> @@ -498,8 +498,8 @@
>    if test "x${RMIC}" = "xno"; then
>      RMIC=${RMIC_DEFAULT}
>    fi
> -  AC_MSG_CHECKING([if $RMIC is a valid executable])
> -  if test -x "${RMIC}"; then
> +  AC_MSG_CHECKING([if $RMIC is a valid executable file])
> +  if test -x "${RMIC}" && test -f "${RMIC}"; then
>      AC_MSG_RESULT([yes])
>    else
>      AC_MSG_RESULT([no])
> @@ -535,8 +535,8 @@
>    if test "x${NATIVE2ASCII}" = "xno"; then
>      NATIVE2ASCII=${NATIVE2ASCII_DEFAULT}
>    fi
> -  AC_MSG_CHECKING([if $NATIVE2ASCII is a valid executable])
> -  if test -x "${NATIVE2ASCII}"; then
> +  AC_MSG_CHECKING([if $NATIVE2ASCII is a valid executable file])
> +  if test -x "${NATIVE2ASCII}" && test -f "${NATIVE2ASCII}"; then
>      AC_MSG_RESULT([yes])
>    else
>      AC_MSG_RESULT([no])