xreg

[Stuart R. Anderson]

Update of /cvs/xtest/utils
In directory gabe:/tmp/cvs-serv28044

Modified Files:
	xreg 
Log Message:
Update to match the new report format

Index: xreg
===================================================================
RCS file: /cvs/xtest/utils/xreg,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- xreg	8 Jul 2005 05:09:04 -0000	1.5
+++ xreg	14 Jul 2005 03:10:31 -0000	1.6
@@ -1748,7 +1748,7 @@
       echo ""                             >> $OUTPUTDIR/xts5.${FILE}.errors
       perl -e'
       while (<>) {
-        if (/^Tests for /) { chomp($name=$_); }
+        if (/^TEST CASE: /) { chomp($name=$_); }
         if (/^ / && $mark) { print; } else { $mark=0; }
         if (/FAIL$/) { print "$name: $_"; $mark=1; }
       }' < $OUTPUTDIR/xts5.${FILE}.report  >> $OUTPUTDIR/xts5.${FILE}.errors
@@ -1762,31 +1762,34 @@
     
       perl -e'
       while (<>) {
-        if (/^Tests for /) { chomp($name=$_); }
+        if (/^TEST CASE: /) { chomp($name=$_); }
         if (/FAIL$/) { print "$name: $_"; }
       }' < $OUTPUTDIR/xts5.${FILE}.report  >  $OUTPUTDIR/xts5.${FILE}.summary
 
       if [ "$CHAPTERS" = "" ]; then
 	rm -f $OUTPUTDIR/tmp.$$
 	touch $OUTPUTDIR/tmp.$$
-	echo 'Tests for XDrawArc: Test  42:  FAIL' >> $OUTPUTDIR/tmp.$$
-	echo 'Tests for XDrawArc: Test  63:  FAIL' >> $OUTPUTDIR/tmp.$$
-	echo 'Tests for XDrawArc: Test  66:  FAIL' >> $OUTPUTDIR/tmp.$$
-	echo 'Tests for XDrawArc: Test  73:  FAIL' >> $OUTPUTDIR/tmp.$$
-	echo 'Tests for XDrawArcs: Test  45:  FAIL' >> $OUTPUTDIR/tmp.$$
-	echo 'Tests for XDrawArcs: Test  66:  FAIL' >> $OUTPUTDIR/tmp.$$
-	echo 'Tests for XDrawArcs: Test  69:  FAIL' >> $OUTPUTDIR/tmp.$$
-	echo 'Tests for XDrawArcs: Test  76:  FAIL' >> $OUTPUTDIR/tmp.$$
+	#Reset the list of waivers, and add things back as they are validated
+	# With the bad acr cases taken out of the scenario file to start with,
+	# we aren't really expecting any failures now.
+	#echo 'TEST CASE: XDrawArc: Test  42:  FAIL' >> $OUTPUTDIR/tmp.$$
+	#echo 'TEST CASE: XDrawArc: Test  63:  FAIL' >> $OUTPUTDIR/tmp.$$
+	#echo 'TEST CASE: XDrawArc: Test  66:  FAIL' >> $OUTPUTDIR/tmp.$$
+	#echo 'TEST CASE: XDrawArc: Test  73:  FAIL' >> $OUTPUTDIR/tmp.$$
+	#echo 'TEST CASE: XDrawArcs: Test  45:  FAIL' >> $OUTPUTDIR/tmp.$$
+	#echo 'TEST CASE: XDrawArcs: Test  66:  FAIL' >> $OUTPUTDIR/tmp.$$
+	#echo 'TEST CASE: XDrawArcs: Test  69:  FAIL' >> $OUTPUTDIR/tmp.$$
+	#echo 'TEST CASE: XDrawArcs: Test  76:  FAIL' >> $OUTPUTDIR/tmp.$$
 
 	# XSync Test 2 fails due to XCursor and Render makes XCreatePixmap
 	# call XSync (this is from the LSB VSW4 test suite notes)
-	echo 'Tests for XSync: Test   2:  FAIL' >> $OUTPUTDIR/tmp.$$
+	#echo 'Tests for XSync: Test   2:  FAIL' >> $OUTPUTDIR/tmp.$$
       
 	# XWriteBitmapFile Test 3 fails under Linux when running as root
 	# because root ignores the mode of the directory.
-	if [ "`whoami`" = "root" ]; then
-	  echo 'Tests for XWriteBitmapFile: Test   3:  FAIL' >> $OUTPUTDIR/tmp.$$
-	fi
+	#if [ "`whoami`" = "root" ]; then
+	#  echo 'Tests for XWriteBitmapFile: Test   3:  FAIL' >> $OUTPUTDIR/tmp.$$
+	#fi
 
 	diff -u $OUTPUTDIR/tmp.$$ $OUTPUTDIR/xts5.${FILE}.summary \
 	 >> $OUTPUTDIR/tmp.$$.diff