From cd181f5b09e6f70be06e057015fb4d8da4582f0e Mon Sep 17 00:00:00 2001
From: Evgeniya Stepanova <evgeniya.stepanova@oracle.com>
Date: Thu, 21 Aug 2014 22:07:14 -0700
Subject: [PATCH] 8055393: [Testbug] Some tests are being executed and fail
 under profiles

Reviewed-by: mchung, dholmes
---
 jdk/test/TEST.groups                                  | 11 ++++++++++-
 .../java/lang/ProcessBuilder/InheritIO/InheritIO.sh   |  5 ++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/jdk/test/TEST.groups b/jdk/test/TEST.groups
index 3cd7450172e..d361a3c5fcb 100644
--- a/jdk/test/TEST.groups
+++ b/jdk/test/TEST.groups
@@ -343,6 +343,7 @@ needs_jdk = \
   java/io/Serializable/serialver \
   java/lang/invoke/lambda/LambdaAccessControlDoPrivilegedTest.java \
   java/lang/invoke/lambda/LambdaAccessControlTest.java \
+  java/lang/invoke/lambda/LambdaAsm.java \
   java/lang/System/MacEncoding/TestFileEncoding.java \
   java/net/URLClassLoader/closetest/GetResourceAsStream.java \
   java/util/Collections/EmptyIterator.java \
@@ -397,6 +398,11 @@ needs_jre = \
   java/text/Bidi/Bug7051769.java \
   javax/crypto/Cipher/CipherStreamClose.java \
   javax/management/monitor/AttributeArbitraryDataTypeTest.java \
+  javax/management/mxbean/AmbiguousConstructorTest.java \
+  javax/management/mxbean/ExceptionDiagnosisTest.java \
+  javax/management/mxbean/LeakTest.java \
+  javax/management/mxbean/MXBeanTest.java \
+  javax/management/mxbean/PropertyNamesTest.java \
   jdk/lambda/vm/InterfaceAccessFlagsTest.java \
   sun/misc/URLClassPath/ClassnameCharTest.java
 
@@ -492,6 +498,7 @@ needs_compact3 = \
   sun/security/acl \
   sun/security/jgss \
   sun/security/krb5 \
+  java/lang/annotation/AnnotationType/AnnotationTypeDeadlockTest.java \
   java/lang/System/MacEncoding/TestFileEncoding.java \
   java/nio/channels/AsynchronousSocketChannel/Leaky.java \
   java/security/PermissionCollection/Concurrent.java \
@@ -499,6 +506,8 @@ needs_compact3 = \
   java/security/cert/GetInstance.java \
   java/util/logging/DrainFindDeadlockTest.java \
   java/util/logging/LoggingMXBeanTest.java \
+  java/util/logging/TestLogConfigurationDeadLock.java \
+  java/util/logging/TestLoggerBundleSync.java \
   sun/net/www/http/KeepAliveCache/B5045306.java \
   sun/security/provider/PolicyFile/Alias.java \
   sun/security/provider/PolicyFile/Comparator.java \
@@ -550,6 +559,7 @@ needs_compact2 = \
   java/lang/PrimitiveSumMinMaxTest.java  \
   java/lang/String/StringJoinTest.java  \
   java/lang/Thread/StopThrowable.java  \
+  java/net/Authenticator/B4769350.java \
   java/net/Authenticator/Deadlock.java \
   java/net/CookieHandler/LocalHostCookie.java \
   java/net/CookieHandler/CookieManagerTest.java \
@@ -600,7 +610,6 @@ needs_compact2 = \
   java/util/zip/ZipFile/StreamZipEntriesTest.java \
   java/util/zip/ZipFile/DeleteTempJar.java \
   javax/crypto/Cipher/CipherStreamClose.java \
-  sun/misc/URLClassPath/ClassnameCharTest.java \
   sun/net/www/protocol/https/HttpsURLConnection/HttpsCreateSockTest.java \
   sun/net/www/protocol/https/HttpsURLConnection/HttpsSocketFacTest.java
 
diff --git a/jdk/test/java/lang/ProcessBuilder/InheritIO/InheritIO.sh b/jdk/test/java/lang/ProcessBuilder/InheritIO/InheritIO.sh
index 2b33a037296..a8cfa51f3dd 100644
--- a/jdk/test/java/lang/ProcessBuilder/InheritIO/InheritIO.sh
+++ b/jdk/test/java/lang/ProcessBuilder/InheritIO/InheritIO.sh
@@ -36,9 +36,12 @@ if [ "x${TESTJAVA}" = "x" ]; then
   exit 1
 fi
 
+if [ "x${COMPILEJAVA}" = "x" ]; then
+  COMPILEJAVA="${TESTJAVA}"
+fi
 
 JAVA="${TESTJAVA}/bin/java"
-JAVAC="${TESTJAVA}/bin/javac"
+JAVAC="${COMPILEJAVA}/bin/javac"
 
 cp -f ${TESTSRC}/InheritIO.java .