# HG changeset patch
# User Andrew John Hughes <gnu.andrew@redhat.com>
# Date 1462325234 -3600
# Node ID 601a674078abcc11ac19e5648f9ae8d6442a81ce
# Parent  17669a12c966506af14df2c7ae5f26632d53d0be
PR2952: test/tapset/jstaptest.pl requires Perl

2016-01-29  Andrew John Hughes  <gnu.andrew@member.fsf.org>

	PR2952: test/tapset/jstaptest.pl requires Perl
	* Makefile.am:
	(check-tapset-probes): Check that Perl is available
	and, if so, use it to invoke the script.
	(check-tapset-jstack): Likewise.
	* NEWS: Updated.
	* configure.ac:
	Check for Perl if SystemTap is found, so the
	tests can be run if required.

diff -r 17669a12c966 -r 601a674078ab ChangeLog
--- a/ChangeLog	Wed May 04 02:51:07 2016 +0100
+++ b/ChangeLog	Wed May 04 02:27:14 2016 +0100
@@ -1,3 +1,15 @@
+2016-01-29  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	PR2952: test/tapset/jstaptest.pl requires Perl
+	* Makefile.am:
+	(check-tapset-probes): Check that Perl is available
+	and, if so, use it to invoke the script.
+	(check-tapset-jstack): Likewise.
+	* NEWS: Updated.
+	* configure.ac:
+	Check for Perl if SystemTap is found, so the
+	tests can be run if required.
+
 2016-05-03  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	* Makefile.am:
diff -r 17669a12c966 -r 601a674078ab Makefile.am
--- a/Makefile.am	Wed May 04 02:51:07 2016 +0100
+++ b/Makefile.am	Wed May 04 02:27:14 2016 +0100
@@ -2797,14 +2797,20 @@
 
 check-tapset-probes: 
 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 -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
diff -r 17669a12c966 -r 601a674078ab NEWS
--- a/NEWS	Wed May 04 02:51:07 2016 +0100
+++ b/NEWS	Wed May 04 02:27:14 2016 +0100
@@ -20,6 +20,7 @@
   - S8150954, PR2868, RH1176206: AWT Robot not compatible with GNOME Shell
 * Bug fixes
   - PR2890: OpenJDK should check for system cacerts database (e.g. /etc/pki/java/cacerts)
+  - PR2952: test/tapset/jstaptest.pl requires Perl
 
 New in release 1.13.10 (2016-01-22):
 
diff -r 17669a12c966 -r 601a674078ab configure.ac
--- a/configure.ac	Wed May 04 02:51:07 2016 +0100
+++ b/configure.ac	Wed May 04 02:27:14 2016 +0100
@@ -434,6 +434,14 @@
 ]])], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([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
+
   ABS_CLIENT_LIBJVM_SO="${ABS_JAVA_HOME_DIR}/jre/lib/${INSTALL_ARCH_DIR}/client/libjvm.so"
   ABS_SERVER_LIBJVM_SO="${ABS_JAVA_HOME_DIR}/jre/lib/${INSTALL_ARCH_DIR}/server/libjvm.so"
   AC_SUBST(ABS_CLIENT_LIBJVM_SO)