# HG changeset patch
# User yhuang
# Date 1369126213 25200
# Node ID 628f27618a6a99d45e8189152c63c3e726eae7a4
# Parent  f9b8c54b68b765686cfbdfc7bebbf7095552520e# Parent  cdd64917d8e6a1e2c0211003d674e46ed48aa9fc
Merge

diff -r f9b8c54b68b7 -r 628f27618a6a jdk/src/solaris/bin/arm/jvm.cfg
--- a/jdk/src/solaris/bin/arm/jvm.cfg	Mon May 20 23:03:35 2013 -0700
+++ b/jdk/src/solaris/bin/arm/jvm.cfg	Tue May 21 01:50:13 2013 -0700
@@ -30,6 +30,6 @@
 # "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
 # and may not be available in a future release.
 #
--client KNOWN
+-client IF_SERVER_CLASS -server
 -server KNOWN
 -minimal KNOWN
diff -r f9b8c54b68b7 -r 628f27618a6a jdk/test/ProblemList.txt
--- a/jdk/test/ProblemList.txt	Mon May 20 23:03:35 2013 -0700
+++ b/jdk/test/ProblemList.txt	Tue May 21 01:50:13 2013 -0700
@@ -137,15 +137,12 @@
 # 8008200
 java/lang/Class/asSubclass/BasicUnit.java                       generic-all
 
-# 8009552
-vm/verifier/TestStaticIF.java                                   generic-all
-
 ############################################################################
 
 # jdk_management
 
 # 8010897
-sun/management/HotspotRuntimeMBean/GetSafepointSyncTime.java	macosx-all 
+sun/management/HotspotRuntimeMBean/GetSafepointSyncTime.java	macosx-all
 
 ############################################################################
 
@@ -305,9 +302,6 @@
 # 7194428
 sun/security/mscapi/ShortRSAKey1024.sh                          windows-all
 
-# 8000897, vm crash
-sun/security/provider/DSA/TestAlgParameterGenerator.java        generic-all
-
 # 7144048, performance issue
 sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/SSLEngineDeadlock.java generic-all
 
@@ -338,12 +332,9 @@
 sun/jvmstat/monitor/MonitoredVm/CR6672135.java                  generic-all
 
 # Tests take too long, on sparcs see 7143279
-tools/pack200/CommandLineTests.java                             solaris-all, macosx-all 
+tools/pack200/CommandLineTests.java                             solaris-all, macosx-all
 tools/pack200/Pack200Test.java                                  solaris-all, macosx-all
 
-# 7150569
-tools/launcher/UnicodeTest.java                                 macosx-all
-
 # 8007410
 tools/launcher/FXLauncherTest.java                              linux-all