7144833: sun/tools/jcmd/jcmd-Defaults.sh failing intermittently
Reviewed-by: alanb
diff --git a/jdk/test/sun/tools/jcmd/jcmd_Output1.awk b/jdk/test/sun/tools/jcmd/jcmd_Output1.awk
index afa5dd4..14fb2f2 100644
--- a/jdk/test/sun/tools/jcmd/jcmd_Output1.awk
+++ b/jdk/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)) {
