/hg/gfx-test: Corrected reporter settings (for RoundRectangle en...

[ptisnovs at icedtea.classpath.org]

changeset f5fecf349633 in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=f5fecf349633
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Tue Sep 14 18:38:43 2010 +0200

	Corrected reporter settings (for RoundRectangle entity), added
	licence text to TestResult.java and changed build targets in
	Makefile.


diffstat:

3 files changed, 49 insertions(+), 9 deletions(-)
Makefile                                 |   16 ++++++------
src/org/gfxtest/reporter/Reporter.java   |    2 -
src/org/gfxtest/reporter/TestResult.java |   40 ++++++++++++++++++++++++++++++

diffs (100 lines):

diff -r e3e509624def -r f5fecf349633 Makefile
--- a/Makefile	Thu Sep 09 19:26:50 2010 +0200
+++ b/Makefile	Tue Sep 14 18:38:43 2010 +0200
@@ -136,7 +136,7 @@ TESTSUITES = $(shell ls -1 src/org/gfxte
 
 SAMPLE_IMAGES = $(shell ls -1 src/org/gfxtest/testsuites | sed -n -e 's/\([A-Za-z0-9]*\)\.java/samples\/\1/p')
 
-all:	build sample_images runtests compareresults report
+all:	build sample_images runtests
 
 build:	$(CLASSES)/stamp $(OUTPUT)/stamp gfxtest.jar
 
@@ -184,6 +184,11 @@ runtests:	gfxtest.jar $(TESTSUITES)
 	mkdir -p $@
 	$(REFERENCE_JAVA) -cp gfxtest.jar $(TEST_PACKAGE).$(subst samples/,,$@) $(RUN_OPTIONS) -o=$@
 
+compare-results:	compareresults
+
+compareresults:	$(COMPARE_RESULTS)
+	mkdir -p masks
+
 # for output/NormalLines the internal macros are set to following:
 # $@ - results/NormalLines
 # $< - output/NormalLines
@@ -192,14 +197,9 @@ runtests:	gfxtest.jar $(TESTSUITES)
 	mkdir -p $@
 	java -jar Lupic.jar -s1=$(SAMPLES)/$* -s2=$< -m=masks -b=bitmap-masks -o=$@ --html --html-results --xml-results --diff-images --struct-diff-images
 
-compare-results:	compareresults
+report:	compareresults gfxtest.jar
+	java -cp gfxtest.jar org.gfxtest.reporter.Reporter -i=$(RESULTS) -o=$(RESULTS)
 
-compareresults:	$(COMPARE_RESULTS)
-	cp results.html $(RESULTS)
-	mkdir -p masks
-
-report:	gfxtest.jar
-	java -cp gfxtest.jar org.gfxtest.reporter.Reporter -i=$(RESULTS) -o=$(RESULTS)
 cleanall:	clean clean-output clean-results clean-samples
 
 clean-all:	cleanall
diff -r e3e509624def -r f5fecf349633 src/org/gfxtest/reporter/Reporter.java
--- a/src/org/gfxtest/reporter/Reporter.java	Thu Sep 09 19:26:50 2010 +0200
+++ b/src/org/gfxtest/reporter/Reporter.java	Tue Sep 14 18:38:43 2010 +0200
@@ -66,7 +66,7 @@ public class Reporter
 
     private static final String[] SPECTESTS = new String[] {"BlankImage"};
 
-    private static final String[] ENTITIES = new String[] {"Lines", "Polylines", "Polygons", "Rectangles", "Round Rectangles", "Circles", "Ellipses", "Arcs"};
+    private static final String[] ENTITIES = new String[] {"Lines", "Polylines", "Polygons", "Rectangles", "RoundRectangles", "Circles", "Ellipses", "Arcs"};
 
     private static final String[] STYLES = new String[] {"Normal", "Filled", "Dashed", "AA"};
 
diff -r e3e509624def -r f5fecf349633 src/org/gfxtest/reporter/TestResult.java
--- a/src/org/gfxtest/reporter/TestResult.java	Thu Sep 09 19:26:50 2010 +0200
+++ b/src/org/gfxtest/reporter/TestResult.java	Tue Sep 14 18:38:43 2010 +0200
@@ -1,3 +1,43 @@ package org.gfxtest.reporter;
+/*
+  Java gfx-test framework
+
+   Copyright (C) 2010  Red Hat
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+IcedTea is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version.
+*/
+
 package org.gfxtest.reporter;
 
 public class TestResult