Merge

hotspot/src/share/vm/compiler/disassembler.hpp

@@ -85,6 +85,7 @@ class Disassembler {
 
  public:
   static bool can_decode() {
+    ttyLocker tl;
     return (_decode_instructions_virtual != NULL) ||
            (_decode_instructions != NULL) ||
            load_library();

hotspot/test/compiler/compilercontrol/commandfile/PrintTest.java

@@ -26,6 +26,7 @@
  * @bug 8137167
  * @summary Tests CompileCommand=print
  * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @ignore 8140354
  * @build compiler.compilercontrol.commandfile.PrintTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*

hotspot/test/compiler/compilercontrol/commands/PrintTest.java

@@ -26,6 +26,7 @@
  * @bug 8137167
  * @summary Tests CompileCommand=print
  * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @ignore 8140354
  * @build compiler.compilercontrol.commands.PrintTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*

hotspot/test/compiler/compilercontrol/directives/PrintTest.java

@@ -26,6 +26,7 @@
  * @bug 8137167
  * @summary Tests directives to be able to turn on print_assembly
  * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @ignore 8140354
  * @build compiler.compilercontrol.directives.PrintTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*

hotspot/test/compiler/compilercontrol/jcmd/PrintDirectivesTest.java

@@ -26,6 +26,7 @@
  * @bug 8137167
  * @summary Tests jcmd to be able to add a directive to compile only specified methods
  * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @ignore 8140354
  * @build compiler.compilercontrol.jcmd.PrintDirectivesTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*

hotspot/test/compiler/compilercontrol/jcmd/StressAddMultiThreadedTest.java

@@ -27,6 +27,7 @@
  * @summary Tests jcmd to be able to add a lot of huge directive files with
  *          parallel executed jcmds until timeout has reached
  * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @ignore 8148563
  * @build compiler.compilercontrol.jcmd.StressAddMultiThreadedTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils

hotspot/test/compiler/compilercontrol/mixed/RandomValidCommandsTest.java

@@ -26,6 +26,7 @@
  * @bug 8137167
  * @summary Randomly generates valid commands with random types
  * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @ignore 8140354
  * @build compiler.compilercontrol.mixed.RandomValidCommandsTest
  *        pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
  *        compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*

hotspot/test/testlibrary/jittester/Makefile

@@ -35,6 +35,15 @@ ifeq "x$(TESTBASE_DIR)" "x"
 	TESTBASE_DIR := ws/hotspot/test
 endif
 
+APPLICATION_ARGS =
+ifneq "x$(TESTS_NUMBER)" "x"
+	APPLICATION_ARGS += --number-of-tests $(TESTS_NUMBER)
+endif
+
+ifneq "x$(SEED)" "x"
+	APPLICATION_ARGS += --seed $(SEED)
+endif
+
 JAVA = $(JDK_HOME)/bin/java
 JAVAC = $(JDK_HOME)/bin/javac
 JAR = $(JDK_HOME)/bin/jar
@@ -43,8 +52,9 @@ BUILD_DIR = build
 CLASSES_DIR = $(BUILD_DIR)/classes
 SRC_DIR = src
 TEST_DIR = test
+DRIVER_DIR = $(TESTBASE_DIR)/jdk/test/lib/jittester/jtreg
 MANIFEST = manifest.mf
-APPLICATION_ARGS = \
+APPLICATION_ARGS += \
     --property-file $(PROPERTY_FILE) \
     --testbase-dir $(TESTBASE_DIR)
 MAIN_CLASS = JitTestGenerator.Automatic
@@ -103,8 +113,8 @@ cleantmp:
 	@rm filelist
 	@rm -rf $(CLASSES_DIR)
 
-copytestlibrary:
+copytestlibrary: $(DRIVER_DIR)
-	@cp -r src/jdk/test/lib/jittester/jtreg $(TESTBASE_DIR)/
+	@cp -r src/jdk/test/lib/jittester/jtreg/*.java $(DRIVER_DIR)
 	@cp -r ../jdk $(TESTBASE_DIR)/
 
 testgroup: $(TESTBASE_DIR)
@@ -117,9 +127,6 @@ testgroup: $(TESTBASE_DIR)
 testroot: $(TESTBASE_DIR)
 	@echo 'groups=TEST.groups' > $(TESTROOT_FILE)
 
-$(TESTBASE_DIR):
+$(TESTBASE_DIR) $(DIST_DIR) $(DRIVER_DIR):
-	$(shell if [ ! -d $@ ]; then mkdir -p $@; fi)
-
-$(DIST_DIR):
 	$(shell if [ ! -d $@ ]; then mkdir -p $@; fi)
 

hotspot/test/testlibrary_tests/whitebox/vm_flags/IntxTest.java

@@ -23,14 +23,13 @@
 
 /*
  * @test IntxTest
- * @bug 8028756
+ * @bug 8038756
- * @ignore 8148758
  * @library /testlibrary /test/lib
  * @modules java.management/sun.management
  * @build IntxTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:-ProfileInterpreter IntxTest
+ * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xint -XX:-ProfileInterpreter IntxTest
  * @summary testing of WB::set/getIntxVMFlag()
  * @author igor.ignatyev@oracle.com
  */