From f639ca490ece47a7b4a067dfced2ee92ca0d83ab Mon Sep 17 00:00:00 2001
From: fparain <unknown>
Date: Wed, 15 Feb 2012 09:29:05 -0800
Subject: [PATCH] 7144833: sun/tools/jcmd/jcmd-Defaults.sh failing
 intermittently Reviewed-by: alanb

---
 test/ProblemList.txt                 |  6 ------
 test/sun/tools/jcmd/jcmd_Output1.awk | 10 +++++-----
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/test/ProblemList.txt b/test/ProblemList.txt
index 901ff09ab..7397a9a84 100644
--- a/test/ProblemList.txt
+++ b/test/ProblemList.txt
@@ -446,12 +446,6 @@ com/sun/jdi/FieldWatchpoints.java                               generic-all
 # 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 --git a/test/sun/tools/jcmd/jcmd_Output1.awk b/test/sun/tools/jcmd/jcmd_Output1.awk
index afa5dd436..14fb2f253 100644
--- a/test/sun/tools/jcmd/jcmd_Output1.awk
+++ b/test/sun/tools/jcmd/jcmd_Output1.awk
@@ -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)) {
-- 
GitLab