# HG changeset patch
# User fparain
# Date 1329326945 28800
# Node ID b1e37377b2a3c9ba9f4e4fb0daf205c4b11ece94
# Parent  dbda165fcfb063094572ea37e5701efd83f0589a
7144833: sun/tools/jcmd/jcmd-Defaults.sh failing intermittently
Reviewed-by: alanb

diff -r dbda165fcfb0 -r b1e37377b2a3 jdk/test/ProblemList.txt
--- a/jdk/test/ProblemList.txt	Wed Feb 15 07:52:58 2012 -0500
+++ b/jdk/test/ProblemList.txt	Wed Feb 15 09:29:05 2012 -0800
@@ -446,12 +446,6 @@
 # Filed 6402201
 com/sun/jdi/ProcessAttachTest.sh                                generic-all
 
-# 7144833
-sun/tools/jcmd/jcmd-Defaults.sh                                 generic-all
-
-# Filed 6986875
-sun/tools/jps/jps-Vvml.sh                                       generic-all
-
 # Filed 6979016
 sun/tools/jconsole/ResourceCheckTest.sh                         generic-all
 
diff -r dbda165fcfb0 -r b1e37377b2a3 jdk/test/sun/tools/jcmd/jcmd_Output1.awk
--- a/jdk/test/sun/tools/jcmd/jcmd_Output1.awk	Wed Feb 15 07:52:58 2012 -0500
+++ b/jdk/test/sun/tools/jcmd/jcmd_Output1.awk	Wed Feb 15 09:29:05 2012 -0800
@@ -1,26 +1,26 @@
 #
 BEGIN	{
-	    totallines=0; matched=0
+            totallines=0; matched=0; current=0
 	}
 
 # match on a main class name followed by arbitrary arguments
 /^[0-9]+ [a-z|A-Z][a-z|A-Z|0-9|\.]*($| .*$)/	{
-	    matched++;
+	    current=1;
 	}
 
 # or match on a path name to a jar file followed by arbitraty arguments
 # - note, jar files ending with ".jar" is only a convention, not a requirement.
 #Theoretically, any valid file name could occur here.
 /^[0-9]+ .*\.jar($| .*$)/	{
-	    matched++;
+	    current=1;
 }
 
 # or match on the condition that the class name is not available
 /^[0-9]+ -- process information unavailable$/	{
-	    matched++;
+	    current=1;
 	}
 
-	{ totallines++; print $0 }
+	{ totallines++; matched+=current; current=0; print $0 }
 
 END	{
 	    if ((totallines > 0) && (matched == totallines)) {