changeset 5090:cd10e1413a76

7165257: Add JFR tests to the JDK code base Reviewed-by: ohair, dholmes, nloodin, mgronlun
author sla
date Thu, 07 Jun 2012 15:28:38 +0200
parents ca3e2e4bf80a
children 19fb8a44120c
files make/jprt.properties test/Makefile
diffstat 2 files changed, 11 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/make/jprt.properties	Wed Jun 20 15:54:25 2012 +0400
+++ b/make/jprt.properties	Thu Jun 07 15:28:38 2012 +0200
@@ -89,6 +89,7 @@
     ${jprt.my.test.target.set:TESTNAME=jdk_text},		\
     ${jprt.my.test.target.set:TESTNAME=jdk_tools1},		\
     ${jprt.my.test.target.set:TESTNAME=jdk_tools2},		\
+    ${jprt.my.test.target.set:TESTNAME=jdk_jfr},		\
     ${jprt.my.test.target.set:TESTNAME=jdk_misc}
 
 # All vm test targets (testset=all)
--- a/test/Makefile	Wed Jun 20 15:54:25 2012 +0400
+++ b/test/Makefile	Thu Jun 07 15:28:38 2012 +0200
@@ -472,6 +472,16 @@
 jdk_io: $(call TestDirs, java/io)
 	$(call RunAgentvmBatch)
 
+# Stable othervm testruns (minus items from PROBLEM_LIST)
+#   Using agentvm has serious problems with these tests
+ifdef OPENJDK
+jdk_jfr:
+else
+JDK_ALL_TARGETS += jdk_jfr
+jdk_jfr: $(call TestDirs, com/oracle/jfr)
+	$(call RunOthervmBatch)
+endif
+
 # Stable agentvm testruns (minus items from PROBLEM_LIST)
 JDK_ALL_TARGETS += jdk_lang
 jdk_lang: $(call TestDirs, java/lang)