--- a/ChangeLog	Fri Jan 29 17:41:08 2016 +0000
+++ b/ChangeLog	Fri Jan 29 22:46:53 2016 +0000
@@ -1,3 +1,17 @@
+2016-01-29  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	PR2804: test/tapset/jstaptest.pl should be executable
+	* Makefile.am:
+	(check-tapset-probes): Check that Perl is available
+	and, if, so use it to invoke the script. Replace
+	BUILD_OUTPUT_DIR with the OpenJDK 8 equivalent,
+	BUILD_IMAGE_DIR.
+	(check-tapset-jstack): Likewise.
+	* NEWS: Updated.
+	* configure.ac:
+	Check for Perl if SystemTap is found, so the
+	tests can be run if required.
+
 2016-01-29  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	PR1983: Support using the system installation

--- a/Makefile.am	Fri Jan 29 17:41:08 2016 +0000
+++ b/Makefile.am	Fri Jan 29 22:46:53 2016 +0000
@@ -2312,15 +2312,21 @@
 
 check-tapset-probes: 
 if ENABLE_SYSTEMTAP
-	$(abs_top_srcdir)/test/tapset/jstaptest.pl \
-	  -B $(BUILD_OUTPUT_DIR) -A $(BUILD_ARCH_DIR) \
+	if test "x${PERL}" = "x"; then \
+	  echo "ERROR: Perl not found"; exit -1; \
+	fi
+	${PERL} $(abs_top_srcdir)/test/tapset/jstaptest.pl \
+	  -B $(BUILD_IMAGE_DIR) -A $(BUILD_ARCH_DIR) \
 	  -S $(abs_top_srcdir)/test/tapset \
 	  -a test/check-stap.log -p
 endif
 
 check-tapset-jstack: 
 if ENABLE_SYSTEMTAP
-	$(abs_top_srcdir)/test/tapset/jstaptest.pl \
+	if test "x${PERL}" = "x"; then \
+	  echo "ERROR: Perl not found"; exit -1; \
+	fi
+	${PERL} $(abs_top_srcdir)/test/tapset/jstaptest.pl \
 	  -B $(BUILD_OUTPUT_DIR) -A $(BUILD_ARCH_DIR) \
 	  -S $(abs_top_srcdir)/test/tapset \
 	  -a test/check-stap.log -j

--- a/NEWS	Fri Jan 29 17:41:08 2016 +0000
+++ b/NEWS	Fri Jan 29 22:46:53 2016 +0000
@@ -130,6 +130,7 @@
   - PR2767: Remove remaining rogue binaries from OpenJDK tree
   - PR2768: Move SystemTap GCC 4.5 patch to OpenJDK tree or discard if no longer needed
   - PR2777: Fix MAX/MIN template usage on s390
+  - PR2804: test/tapset/jstaptest.pl should be executable
   - PR2815: Race condition in SunEC provider with system NSS
   - Don't substitute 'j' for '-j' inside -I directives
   - Extend 8041658 to all files in the HotSpot build.

--- a/configure.ac	Fri Jan 29 17:41:08 2016 +0000
+++ b/configure.ac	Fri Jan 29 22:46:53 2016 +0000
@@ -252,6 +252,14 @@
   inst.method(24);
 ]])], [AC_MSG_RESULT([yes])], [SDT_H_FOUND='no'; AC_MSG_WARN([systemtap sdt.h or g++ too old])])
 AC_LANG_POP([C++])
+if test "x${SDT_H_FOUND}" = "xyes"; then
+ AC_PATH_TOOL([PERL],[perl])
+ if test x"${PERL}" = x ; then
+   AC_MSG_WARN([Perl not found in PATH; SystemTap tests will not be able to run])
+ fi
+ AC_SUBST(PERL)
+fi
+
 AM_CONDITIONAL([ENABLE_SYSTEMTAP], [test x$SDT_H_FOUND = xyes])
 
 AC_MSG_CHECKING([for absolute java home install dir])