changeset 18581:8efa694a57af

8019384: jps and jcmd tests fail when there is a process started with a .war file Reviewed-by: dcubed, sla, mchung
author alanb
date Fri, 28 Jun 2013 19:45:06 +0100
parents 6c4badf4ffba
children 4775433fb800
files jdk/test/sun/tools/jcmd/jcmd_Output1.awk jdk/test/sun/tools/jps/jps-l_Output1.awk jdk/test/sun/tools/jps/jps_Output1.awk
diffstat 3 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/test/sun/tools/jcmd/jcmd_Output1.awk	Fri Jun 28 11:35:36 2013 -0700
+++ b/jdk/test/sun/tools/jcmd/jcmd_Output1.awk	Fri Jun 28 19:45:06 2013 +0100
@@ -8,10 +8,10 @@
 	    current=1;
 	}
 
-# or match on a path name to a jar file followed by arbitraty arguments
+# or match on a path name to a jar or war 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($| .*$)/	{
+/^[0-9]+ .*\.(jar|war)($| .*$)/	{
 	    current=1;
 }
 
--- a/jdk/test/sun/tools/jps/jps-l_Output1.awk	Fri Jun 28 11:35:36 2013 -0700
+++ b/jdk/test/sun/tools/jps/jps-l_Output1.awk	Fri Jun 28 19:45:06 2013 +0100
@@ -8,10 +8,10 @@
 	    matched++;
 	}
 
-# or match on a jar file name - note, jar files ending with
+# or match on a jar or war file name - note, jar files ending with
 # ".jar" is only a convention , not a requirement. Theoretically,
 # any valid file name could occur here.
-/^[0-9]+ .*\.jar$/	{
+/^[0-9]+ .*\.(jar|war)$/	{
 	    matched++;
 }
 
--- a/jdk/test/sun/tools/jps/jps_Output1.awk	Fri Jun 28 11:35:36 2013 -0700
+++ b/jdk/test/sun/tools/jps/jps_Output1.awk	Fri Jun 28 19:45:06 2013 +0100
@@ -8,10 +8,10 @@
 	    matched++;
 	}
 
-# or match on a path name to a jar file - note, jar files ending with
+# or match on a path name to a jar or war file - note, jar files ending with
 # ".jar" is only a convention, not a requirement. Theoretically,
 # any valid file name could occur here.
-/^[0-9]+ .*\.jar$/	{
+/^[0-9]+ .*\.(jar|war)$/	{
 	    matched++;
 }