--- a/ChangeLog	Mon Aug 15 03:44:04 2016 +0100
+++ b/ChangeLog	Mon Aug 15 03:54:34 2016 +0100
@@ -1,3 +1,21 @@
+2016-03-04  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	PR3112: 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,
+	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-08-14  Andrew John Hughes  <gnu.andrew@redhat.com>
 
 	PR3139: Update documentation

--- a/INSTALL	Mon Aug 15 03:44:04 2016 +0100
+++ b/INSTALL	Mon Aug 15 03:54:34 2016 +0100
@@ -159,6 +159,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.
 * --enable-pulse-java: Build the PulseAudio sound provider.
 * --disable-xrender: Don't include the XRender pipeline.
 * --enable-systemtap: Include support for tracing using systemtap.

--- a/Makefile.am	Mon Aug 15 03:44:04 2016 +0100
+++ b/Makefile.am	Mon Aug 15 03:54:34 2016 +0100
@@ -250,6 +250,10 @@
 endif
 endif
 
+if !DISABLE_SYSTEMTAP_TESTS
+SYSTEMTAP_TEST_SUITE = check-tapset
+endif
+
 # Target to ensure a patched OpenJDK tree containing Zero & Shark
 # and any overlays is available in $(abs_top_builddir)/openjdk
 OPENJDK_TREE = stamps/overlay.stamp
@@ -993,7 +997,7 @@
 
 all-local: icedtea-against-icedtea
 
-check-local: jtregcheck check-tapset
+check-local: jtregcheck $(SYSTEMTAP_TEST_SUITE)
 
 clean-tests: clean-jtreg clean-tapset-report
 	if [ $(abs_top_srcdir) != $(abs_top_builddir) ] ; then \
@@ -1046,10 +1050,11 @@
 	clean-add-pulseaudio clean-add-pulseaudio-debug clean-add-nss clean-add-nss-debug \
 	clean-add-tzdata-support clean-add-tzdata-support-debug clean-add-systemtap-ecj \
 	clean-add-pulseaudio-ecj clean-add-nss-ecj clean-add-tzdata-support-ecj clean-fonts \
-	clean-download-hotspot clean-tests clean-tapset-report jtregcheck clean-pax-mark-vm \
+	clean-download-hotspot clean-tests clean-tapset-report clean-pax-mark-vm \
 	clean-pax-mark-vm-debug clean-pax-mark-vm-ecj clean-check-crypto clean-check-crypto-debug \
 	clean-check-crypto-boot clean-cryptocheck clean-runnable-icedtea clean-runnable-icedtea-debug \
-	clean-runnable-icedtea-ecj
+	check-jdk check-hotspot check-langtools jtregcheck check-tapset check-tapset-probes \
+	check-tapset-jstack clean-runnable-icedtea-ecj
 
 env:
 	@echo 'unset JAVA_HOME'

--- a/NEWS	Mon Aug 15 03:44:04 2016 +0100
+++ b/NEWS	Mon Aug 15 03:54:34 2016 +0100
@@ -38,6 +38,7 @@
   - PR2962: System default check doesn't match all GNU/Linux systems
   - PR2969: ENABLE_SYSTEM_LCMS is not defined if ENABLE_LCMS2 is not set
   - PR3092: SystemTap is heavily confused by multiple JDKs
+  - PR3112: Provide option to disable SystemTap tests
   - PR3137: GTKLookAndFeel does not honor gtk-alternative-button-order
   - PR3139: Update documentation
 

--- a/acinclude.m4	Mon Aug 15 03:44:04 2016 +0100
+++ b/acinclude.m4	Mon Aug 15 03:54:34 2016 +0100
@@ -2415,3 +2415,25 @@
   fi
   AC_SUBST(fontdir)
 ])
+
+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	Mon Aug 15 03:44:04 2016 +0100
+++ b/configure.ac	Mon Aug 15 03:54:34 2016 +0100
@@ -61,6 +61,7 @@
 IT_DISABLE_HOTSPOT_TESTS
 IT_DISABLE_LANGTOOLS_TESTS
 IT_DISABLE_JDK_TESTS
+IT_DISABLE_SYSTEMTAP_TESTS
 
 IT_WITH_FONTS_DIR
 AC_CONFIG_FILES([linux.fontconfig.Gentoo.properties])