--- old/./Makefile	Tue Mar 29 16:23:32 2011
+++ new/./Makefile	Tue Mar 29 16:23:32 2011
@@ -450,7 +450,7 @@
 # Get failure list from log
 $(OUTPUTDIR)/test_failures.txt: $(OUTPUTDIR)/test_log.txt
 	@$(RM) $@
-	@( $(EGREP) '^FAILED:' $< || $(ECHO) "" ) > $@
+	@( $(EGREP) '^FAILED:' $< || $(ECHO) "" ) | $(NAWK) 'length>0' > $@
 
 # Get log file of all tests run
 JDK_TO_TEST := $(shell 							\
@@ -464,8 +464,12 @@
 )
 $(OUTPUTDIR)/test_log.txt:
 	$(RM) $@
-	( $(CD) test &&                                     \
-          $(MAKE) NO_STOPPING=- PRODUCT_HOME=$(JDK_TO_TEST) \
+	( $(CD) test &&                                     		\
+          $(MAKE) NO_STOPPING=- 					\
+	          ALT_OUTPUTDIR=$(ABS_OUTPUTDIR)			\
+		  ALT_JDK_IMPORT_PATH=$(JDK_TO_TEST) 			\
+		  PRODUCT_HOME=$(JDK_TO_TEST) 				\
+	          LANGTOOLS_PRODUCT_HOME=$(ABS_OUTPUTDIR)/langtools 	\
         ) | tee $@
 
 ################################################################
--- old/./test/Makefile	Tue Mar 29 16:23:33 2011
+++ new/./test/Makefile	Tue Mar 29 16:23:33 2011
@@ -50,7 +50,7 @@
 endef
 
 # Test target list for langtools repository
-LANGTOOLS_TEST_LIST = langtools_jtreg
+LANGTOOLS_TEST_LIST = all
 
 # Test target list for jdk repository
 JDK_TEST_LIST = \
@@ -78,9 +78,9 @@
 
 # Test targets
 $(LANGTOOLS_TEST_LIST):
-	@$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), $(subst langtools_,,$@))
+	@$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), $@ PRODUCT_HOME=$(LANGTOOLS_PRODUCT_HOME))
 $(JDK_TEST_LIST):
-	@$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), $@)
+	@$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), $@ PRODUCT_HOME=$(PRODUCT_HOME))
 
 clean:
 
--- old/jdk/test/Makefile	Tue Mar 29 16:23:33 2011
+++ new/jdk/test/Makefile	Tue Mar 29 16:23:33 2011
@@ -543,7 +543,7 @@
 #  This could be a hotspot vm issue. So someday, change this to Samevm.
 JDK_ALL_TARGETS += jdk_tools1
 jdk_tools1: com/sun/jdi
-	$(call RunOthevmBatch)
+	$(call RunOthervmBatch)
 
 # Stable othervm testruns (minus items from PROBLEM_LIST)
 #   Using samevm has serious problems with these tests
--- old/jdk/test/ProblemList.txt	Tue Mar 29 16:23:34 2011
+++ new/jdk/test/ProblemList.txt	Tue Mar 29 16:23:34 2011
@@ -332,6 +332,9 @@
 
 # jdk_lang
 
+# Fails on OpenSolaris, see 6992968
+java/lang/management/MemoryMXBean/CollectionUsageThresholdConcMarkSweepGC.sh generic-all
+
 # Solaris 10 sparc: main -- Error. Error while cleaning up threads after test
 java/lang/management/ThreadMXBean/ThreadBlockedCount.java	generic-all
 
@@ -583,6 +586,15 @@
 # Suspect many of these tests auffer from using fixed ports, no concrete 
 #   evidence.
 
+# Fails on OpenSolaris, see 7032247
+java/net/InetAddress/GetLocalHostWithSM.java			generic-all
+
+# Fails on OpenSolaris, see 6935199
+java/net/CookieHandler/TestHttpCookie.java			generic-all
+
+# Fails on OpenSolaris, see 6423396
+com/sun/net/httpserver/bugs/B6373555.java			generic-all
+
 # Fails on Linux Fedora 9, 32bit and 64bit, Windows 2000 & 2003/X64
 #   samevm "cleaning up threads" issue, kind of passes,
 #   then jtreg says: Error while cleaning up threads after test
@@ -734,6 +746,9 @@
 
 # jdk_nio
 
+# Fails on OpenSolaris, see 6983794
+java/nio/channels/Selector/ConnectWrite.java			generic-all
+
 # Unused Charset subclass: sun.nio.cs.ext.MS932DB  RuntimeException
 java/nio/charset/Charset/NIOCharsetAvailabilityTest.java	generic-all
 
@@ -920,6 +935,16 @@
 
 # jdk_security
 
+# Fails on OpenSolaris, see 7032257
+sun/security/pkcs11/ec/ReadCertificates.java			generic-all
+sun/security/pkcs11/ec/ReadPKCS12.java				generic-all
+sun/security/pkcs11/ec/TestCurves.java				generic-all
+sun/security/pkcs11/ec/TestECDSA.java				generic-all
+sun/security/pkcs11/ec/TestECGenSpec.java			generic-all
+sun/security/pkcs11/ec/TestKeyFactory.java			generic-all
+sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnection/CriticalSubjectAltName.java generic-all
+sun/security/validator/CertReplace.java				generic-all
+
 # java.security.cert.CertificateException: Certificate contains unsupported critical extensions: [2.5.29.17]
 sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/DNSIdentities.java generic-all
 sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/IPAddressIPIdentities.java generic-all
@@ -1149,6 +1174,9 @@
 
 # jdk_util
 
+# Fails on OpenSolaris, see 6876961
+java/util/ResourceBundle/Test4300693.java			generic-all
+
 # Fails Windows 2000, AssertionError: Some tests failed at Basic.java:96
 java/util/concurrent/TimeUnit/Basic.java			generic-all