--- a/ChangeLog	Wed Jul 27 05:29:59 2016 +0100
+++ b/ChangeLog	Wed Jul 27 05:41:48 2016 +0100
@@ -1,3 +1,22 @@
+2016-03-04  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	PR3111: 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-07-26  Andrew John Hughes  <gnu.andrew@redhat.com>
 
 	PR2799: Files are missing from resources.jar

--- a/INSTALL	Wed Jul 27 05:29:59 2016 +0100
+++ b/INSTALL	Wed Jul 27 05:41:48 2016 +0100
@@ -238,6 +238,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-nss: Enable the NSS security provider.
 * --enable-cacao: Replace HotSpot with the CACAO VM.

--- a/Makefile.am	Wed Jul 27 05:29:59 2016 +0100
+++ b/Makefile.am	Wed Jul 27 05:41:48 2016 +0100
@@ -711,6 +711,10 @@
 	PAX_COMMAND="${PAX_COMMAND}"
 endif
 
+if !DISABLE_SYSTEMTAP_TESTS
+SYSTEMTAP_TEST_SUITE = check-tapset
+endif
+
 if ENABLE_SUNEC
 ICEDTEA_ENV += \
 	SYSTEM_NSS="true" \
@@ -926,7 +930,7 @@
 
 all-local: icedtea-stage2 $(DESKTOP_FILES)
 
-check-local: jtregcheck check-tapset check-mimetype
+check-local: jtregcheck $(SYSTEMTAP_TEST_SUITE) check-mimetype
 
 clean-tests: clean-jtreg clean-tapset-report clean-jtreg-reports \
   clean-check-mimetype
@@ -984,7 +988,10 @@
 	clean-extract-corba clean-extract-jaxp clean-extract-jaxws clean-extract-jdk \
 	clean-extract-langtools clean-split-debuginfo clean-split-debuginfo-debug \
 	clean-split-debuginfo-boot clean-policytool-@JAVA_VER@.desktop clean-jconsole-@JAVA_VER@.desktop \
-	clean-fonts clean-add-mime-types-file clean-add-mime-types-file-debug clean-add-mime-types-file-boot
+	clean-fonts clean-add-mime-types-file clean-add-mime-types-file-debug clean-add-mime-types-file-boot \
+	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	Wed Jul 27 05:29:59 2016 +0100
+++ b/NEWS	Wed Jul 27 05:41:48 2016 +0100
@@ -48,6 +48,7 @@
   - PR2900: Don't use WithSeed versions of NSS functions as they don't fully process the seed
   - PR3091: SystemTap is heavily confused by multiple JDKs
   - PR3103: Handle case in clean-fonts where linux.fontconfig.Gentoo.properties.old has not been created
+  - PR3111: Provide option to disable SystemTap tests
 * AArch64 port
   - S8148328: aarch64: redundant lsr instructions in stub code.
   - S8148783: aarch64: SEGV running SpecJBB2013

--- a/acinclude.m4	Wed Jul 27 05:29:59 2016 +0100
+++ b/acinclude.m4	Wed Jul 27 05:41:48 2016 +0100
@@ -3403,3 +3403,25 @@
   AC_SUBST([MIME_TYPES_FILE])
   AM_CONDITIONAL(MIME_TYPES_FILE_FOUND, test "x${mime_types_file_found}" = "xyes")
 ])
+
+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	Wed Jul 27 05:29:59 2016 +0100
+++ b/configure.ac	Wed Jul 27 05:41:48 2016 +0100
@@ -57,6 +57,7 @@
 IT_DISABLE_HOTSPOT_TESTS
 IT_DISABLE_LANGTOOLS_TESTS
 IT_DISABLE_JDK_TESTS
+IT_DISABLE_SYSTEMTAP_TESTS
 IT_ENABLE_SUNEC
 IT_ENABLE_NATIVE_DEBUGINFO
 IT_ENABLE_JAVA_DEBUGINFO