changeset 9152:a543d4525920

6545321: [TESTBUG] jstatLineCounts4.sh has to be resilient to unexpected output Summary: Keep check for specific lines. Remove check for total number of lines. Reviewed-by: sla Contributed-by: mattias.tobiasson@oracle.com
author sla
date Tue, 21 Jan 2014 08:36:12 +0100
parents 9f2d6628699c
children 381feaeb75bb
files test/sun/tools/jstat/classOutput1.awk test/sun/tools/jstat/classloadOutput1.awk test/sun/tools/jstat/compilerOutput1.awk test/sun/tools/jstat/fileURITest1.awk test/sun/tools/jstat/gcCapacityOutput1.awk test/sun/tools/jstat/gcCauseOutput1.awk test/sun/tools/jstat/gcMetaCapacityOutput1.awk test/sun/tools/jstat/gcNewCapacityOutput1.awk test/sun/tools/jstat/gcOldCapacityOutput1.awk test/sun/tools/jstat/gcOldOutput1.awk test/sun/tools/jstat/gcOutput1.awk test/sun/tools/jstat/lineCounts1.awk test/sun/tools/jstat/lineCounts2.awk test/sun/tools/jstat/lineCounts3.awk test/sun/tools/jstat/lineCounts4.awk test/sun/tools/jstat/printCompilationOutput1.awk test/sun/tools/jstat/timeStamp1.awk
diffstat 17 files changed, 17 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/test/sun/tools/jstat/classOutput1.awk	Wed Jan 22 09:36:11 2014 +0000
+++ b/test/sun/tools/jstat/classOutput1.awk	Tue Jan 21 08:36:12 2014 +0100
@@ -21,7 +21,7 @@
 	{ totallines++; print $0 }
 
 END	{
-	    if ((headerlines == 1) && (datalines == 1) && (totallines == 2)) {
+	    if ((headerlines == 1) && (datalines == 1)) {
 	        exit 0
 	    }
 	    else {
--- a/test/sun/tools/jstat/classloadOutput1.awk	Wed Jan 22 09:36:11 2014 +0000
+++ b/test/sun/tools/jstat/classloadOutput1.awk	Tue Jan 21 08:36:12 2014 +0100
@@ -22,7 +22,7 @@
 	{ totallines++; print $0 }
 
 END	{
-	    if ((headerlines == 1) && (datalines == 1) && (totallines == 2)) {
+	    if ((headerlines == 1) && (datalines == 1)) {
 	        exit 0
 	    }
 	    else {
--- a/test/sun/tools/jstat/compilerOutput1.awk	Wed Jan 22 09:36:11 2014 +0000
+++ b/test/sun/tools/jstat/compilerOutput1.awk	Tue Jan 21 08:36:12 2014 +0100
@@ -30,7 +30,7 @@
 	{ totallines++; print $0 }
 
 END	{
-	    if ((headerlines == 1) && (datalines == 1) && (totallines == 2)) {
+	    if ((headerlines == 1) && (datalines == 1)) {
 	        exit 0
 	    }
 	    else {
--- a/test/sun/tools/jstat/fileURITest1.awk	Wed Jan 22 09:36:11 2014 +0000
+++ b/test/sun/tools/jstat/fileURITest1.awk	Tue Jan 21 08:36:12 2014 +0100
@@ -21,7 +21,7 @@
 	{ totallines++; print $0 }
 
 END	{
-	    if ((headerlines == 1) && (datalines == 1) && (totallines == 2)) {
+	    if ((headerlines == 1) && (datalines == 1)) {
 	        exit 0
 	    }
 	    else {
--- a/test/sun/tools/jstat/gcCapacityOutput1.awk	Wed Jan 22 09:36:11 2014 +0000
+++ b/test/sun/tools/jstat/gcCapacityOutput1.awk	Tue Jan 21 08:36:12 2014 +0100
@@ -22,7 +22,7 @@
 	{ totallines++; print $0 }
 
 END	{
-	    if ((headerlines == 1) && (datalines == 1) && (totallines == 2)) {
+	    if ((headerlines == 1) && (datalines == 1)) {
 	        exit 0
 	    }
 	    else {
--- a/test/sun/tools/jstat/gcCauseOutput1.awk	Wed Jan 22 09:36:11 2014 +0000
+++ b/test/sun/tools/jstat/gcCauseOutput1.awk	Tue Jan 21 08:36:12 2014 +0100
@@ -30,7 +30,7 @@
 	{ totallines++; print $0 }
 
 END	{
-	    if ((headerlines == 1) && (datalines == 1) && (totallines == 2)) {
+	    if ((headerlines == 1) && (datalines == 1)) {
 	        exit 0
 	    }
 	    else {
--- a/test/sun/tools/jstat/gcMetaCapacityOutput1.awk	Wed Jan 22 09:36:11 2014 +0000
+++ b/test/sun/tools/jstat/gcMetaCapacityOutput1.awk	Tue Jan 21 08:36:12 2014 +0100
@@ -21,7 +21,7 @@
 	{ totallines++; print $0 }
 
 END	{
-	    if ((headerlines == 1) && (datalines == 1) && (totallines == 2)) {
+	    if ((headerlines == 1) && (datalines == 1)) {
 	        exit 0
 	    }
 	    else {
--- a/test/sun/tools/jstat/gcNewCapacityOutput1.awk	Wed Jan 22 09:36:11 2014 +0000
+++ b/test/sun/tools/jstat/gcNewCapacityOutput1.awk	Tue Jan 21 08:36:12 2014 +0100
@@ -22,7 +22,7 @@
 	{ totallines++; print $0 }
 
 END	{
-	    if ((headerlines == 1) && (datalines == 1) && (totallines == 2)) {
+	    if ((headerlines == 1) && (datalines == 1)) {
 	        exit 0
 	    }
 	    else {
--- a/test/sun/tools/jstat/gcOldCapacityOutput1.awk	Wed Jan 22 09:36:11 2014 +0000
+++ b/test/sun/tools/jstat/gcOldCapacityOutput1.awk	Tue Jan 21 08:36:12 2014 +0100
@@ -21,7 +21,7 @@
 	{ totallines++; print $0 }
 
 END	{
-	    if ((headerlines == 1) && (datalines == 1) && (totallines == 2)) {
+	    if ((headerlines == 1) && (datalines == 1)) {
 	        exit 0
 	    }
 	    else {
--- a/test/sun/tools/jstat/gcOldOutput1.awk	Wed Jan 22 09:36:11 2014 +0000
+++ b/test/sun/tools/jstat/gcOldOutput1.awk	Tue Jan 21 08:36:12 2014 +0100
@@ -22,7 +22,7 @@
 	{ totallines++; print $0 }
 
 END	{
-	    if ((headerlines == 1) && (datalines == 1) && (totallines == 2)) {
+	    if ((headerlines == 1) && (datalines == 1)) {
 	        exit 0
 	    }
 	    else {
--- a/test/sun/tools/jstat/gcOutput1.awk	Wed Jan 22 09:36:11 2014 +0000
+++ b/test/sun/tools/jstat/gcOutput1.awk	Tue Jan 21 08:36:12 2014 +0100
@@ -22,7 +22,7 @@
 	{ totallines++; print $0 }
 
 END	{
-	    if ((headerlines == 1) && (datalines == 1) && (totallines == 2)) {
+	    if ((headerlines == 1) && (datalines == 1)) {
 	        exit 0
 	    }
 	    else {
--- a/test/sun/tools/jstat/lineCounts1.awk	Wed Jan 22 09:36:11 2014 +0000
+++ b/test/sun/tools/jstat/lineCounts1.awk	Tue Jan 21 08:36:12 2014 +0100
@@ -25,7 +25,7 @@
 	{ totallines++; print $0 }
 
 END	{
-	    if ((headerlines == 1) && (datalines == 5) && (totallines == 6)) {
+	    if ((headerlines == 1) && (datalines == 5)) {
 	        exit 0
             }
             else {
--- a/test/sun/tools/jstat/lineCounts2.awk	Wed Jan 22 09:36:11 2014 +0000
+++ b/test/sun/tools/jstat/lineCounts2.awk	Tue Jan 21 08:36:12 2014 +0100
@@ -21,7 +21,7 @@
 	{ totallines++; print $0 }
 
 END	{
-	    if ((headerlines == 1) && (datalines == 1) && (totallines == 2)) {
+	    if ((headerlines == 1) && (datalines == 1)) {
 	        exit 0
 	    }
 	    else {
--- a/test/sun/tools/jstat/lineCounts3.awk	Wed Jan 22 09:36:11 2014 +0000
+++ b/test/sun/tools/jstat/lineCounts3.awk	Tue Jan 21 08:36:12 2014 +0100
@@ -30,7 +30,7 @@
 	{ totallines++; print $0 }
 
 END	{ 
-	    if ((headerlines == 1) && (datalines == 10) && (totallines == 11)) {
+	    if ((headerlines == 1) && (datalines == 10)) {
 	        exit 0
 	    } else {
 	        exit 1
--- a/test/sun/tools/jstat/lineCounts4.awk	Wed Jan 22 09:36:11 2014 +0000
+++ b/test/sun/tools/jstat/lineCounts4.awk	Tue Jan 21 08:36:12 2014 +0100
@@ -36,7 +36,7 @@
 	{ totallines++; print $0 }
 
 END	{ 
-	    if ((headerlines == 2) && (datalines == 11) && (totallines == 13) && (datalines2 == 1)) {
+	    if ((headerlines == 2) && (datalines == 11) && (datalines2 == 1)) {
 	        exit 0
 	    } else {
 	        exit 1
--- a/test/sun/tools/jstat/printCompilationOutput1.awk	Wed Jan 22 09:36:11 2014 +0000
+++ b/test/sun/tools/jstat/printCompilationOutput1.awk	Tue Jan 21 08:36:12 2014 +0100
@@ -25,7 +25,7 @@
 	{ totallines++; print $0 }
 
 END	{
-	    if ((headerlines == 1) && (datalines == 1) && (totallines == 2)) {
+	    if ((headerlines == 1) && (datalines == 1)) {
 	        exit 0
 	    }
 	    else {
--- a/test/sun/tools/jstat/timeStamp1.awk	Wed Jan 22 09:36:11 2014 +0000
+++ b/test/sun/tools/jstat/timeStamp1.awk	Tue Jan 21 08:36:12 2014 +0100
@@ -21,7 +21,7 @@
 	{ totallines++; print $0 }
 
 END	{
-	    if ((headerlines == 1) && (datalines == 1) && (totallines == 2)) {
+	    if ((headerlines == 1) && (datalines == 1)) {
 	        exit 0
 	    }
 	    else {