--- a/ChangeLog	Fri Mar 04 20:38:10 2016 +0000
+++ b/ChangeLog	Sat Mar 05 02:06:23 2016 +0000
@@ -1,3 +1,22 @@
+2016-03-04  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	PR2826: Provide option to disable SystemTap tests
+	* INSTALL: Document --disable-systemtap-tests.
+	* Makefile.am:
+	(SYSTEMTAP_TEST_SUITE): Define if SystemTap tests
+	are enabled.
+	(check-local): Use SYSTEMTAP_TEST_SUITE in place
+	of check-tapset.
+	(.PHONY): Add check-jdk, check-hotspot, check-langtools,
+	jtregcheck, check-tapset, check-tapset-probes and
+	check-tapset-jstack
+	* NEWS: Updated.
+	* acinclude.m4:
+	(IT_DISABLE_SYSTEMTAP_TESTS): Add option to
+	disable SystemTap tests.
+	* configure.ac:
+	Call IT_DISABLE_SYSTEMTAP_TESTS.
+
 2016-03-04  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	PR2865: Handle uninstallation.

--- a/INSTALL	Fri Mar 04 20:38:10 2016 +0000
+++ b/INSTALL	Sat Mar 05 02:06:23 2016 +0000
@@ -147,6 +147,7 @@
 * --disable-hotspot-tests: Disable the running of the HotSpot JTReg suite.
 * --disable-langtools-tests: Disable the running of the langtools JTReg suite.
 * --disable-jdk-tests: Disable the running of the jdk JTreg suite.
+* --disable-systemtap-tests: Disable the running of the SystemTap test suite.
 * --disable-xrender: Don't include the XRender pipeline.
 * --enable-systemtap: Include support for tracing using systemtap.
 * --enable-nss: Enable the NSS security provider.

--- a/Makefile.am	Fri Mar 04 20:38:10 2016 +0000
+++ b/Makefile.am	Sat Mar 05 02:06:23 2016 +0000
@@ -195,6 +195,10 @@
 TESTS_TO_RUN = jtreg $(addprefix check-,$(TEST_SUITES))
 endif
 
+if !DISABLE_SYSTEMTAP_TESTS
+SYSTEMTAP_TEST_SUITE = check-tapset
+endif
+
 if ENABLE_SUNEC
 ECC_RESULT = yes
 else
@@ -589,7 +593,7 @@
 
 all-local: icedtea-stage2
 
-check-local: jtregcheck check-tapset stamps/check-ecc.stamp
+check-local: jtregcheck $(SYSTEMTAP_TEST_SUITE) stamps/check-ecc.stamp
 
 clean-tests: clean-jtreg clean-tapset-report clean-jtreg-reports clean-check-ecc
 	if [ $(abs_top_srcdir) != $(abs_top_builddir) ] ; then \
@@ -635,7 +639,9 @@
 	clean-download-nashorn clean-extract-nashorn clean-download-hotspot \
 	clean-check-crypto clean-check-crypto-debug clean-check-crypto-boot \
 	clean-add-archive clean-add-archive-debug clean-add-archive-boot clean-cryptocheck \
-	clean-tests clean-tapset-report clean-ecccheck clean-check-ecc
+	clean-tests clean-tapset-report clean-ecccheck clean-check-ecc \
+	check-jdk check-hotspot check-langtools jtregcheck check-tapset check-tapset-probes \
+	check-tapset-jstack
 
 env:
 	@echo 'unset JAVA_HOME'

--- a/NEWS	Fri Mar 04 20:38:10 2016 +0000
+++ b/NEWS	Sat Mar 05 02:06:23 2016 +0000
@@ -136,6 +136,7 @@
   - PR2804: test/tapset/jstaptest.pl should be executable
   - PR2815: Race condition in SunEC provider with system NSS
   - PR2825: Placement of -lfreebl matters when using bfd linker
+  - PR2826: Provide option to disable SystemTap tests
   - PR2841: Parallelism issues resulting from PR2459
   - PR2853: Fix build for aarch64/zero
   - PR2853: Remaining miscellaneous synchronisation changes from aarch64/jdk8u

--- a/acinclude.m4	Fri Mar 04 20:38:10 2016 +0000
+++ b/acinclude.m4	Sat Mar 05 02:06:23 2016 +0000
@@ -1997,3 +1997,25 @@
   rm -f tmp.$$/t
   ${RMDIR} tmp.$$
 ])
+
+AC_DEFUN_ONCE([IT_DISABLE_SYSTEMTAP_TESTS],
+[
+  AC_MSG_CHECKING([whether to disable the execution of the SystemTap tests])
+  AC_ARG_ENABLE([systemtap-tests],
+                [AS_HELP_STRING(--disable-systemtap-tests,do not run the SystemTap tests via make check [[default=no]])],
+  [
+    case "${enableval}" in
+      no)
+        disable_systemtap_tests=yes
+        ;;
+      *)
+        disable_systemtap_tests=no
+        ;;
+    esac
+  ],
+  [
+    disable_systemtap_tests=no
+  ])
+  AC_MSG_RESULT([$disable_systemtap_tests])
+  AM_CONDITIONAL([DISABLE_SYSTEMTAP_TESTS], test x"${disable_systemtap_tests}" = "xyes")
+])

--- a/configure.ac	Fri Mar 04 20:38:10 2016 +0000
+++ b/configure.ac	Sat Mar 05 02:06:23 2016 +0000
@@ -59,6 +59,7 @@
 IT_DISABLE_HOTSPOT_TESTS
 IT_DISABLE_LANGTOOLS_TESTS
 IT_DISABLE_JDK_TESTS
+IT_DISABLE_SYSTEMTAP_TESTS
 IT_ENABLE_SUNEC
 
 # Use xvfb-run if found to run gui tests (check-jdk).