1.1 --- a/test/test-automation/SDL_test.h Fri Jul 01 13:29:19 2011 +0300
1.2 +++ b/test/test-automation/SDL_test.h Fri Jul 01 17:11:20 2011 +0300
1.3 @@ -85,4 +85,14 @@
1.4 */
1.5 void AssertTrue(int condition, char *message, ...);
1.6
1.7 +/*!
1.8 +\todo add markup
1.9 +*/
1.10 +void AssertFail(char *message, ...);
1.11 +
1.12 +/*!
1.13 +\todo add markup
1.14 +*/
1.15 +void AssertPass(char *message, ...);
1.16 +
1.17 #endif
2.1 --- a/test/test-automation/build-scripts/config.guess Fri Jul 01 13:29:19 2011 +0300
2.2 +++ b/test/test-automation/build-scripts/config.guess Fri Jul 01 17:11:20 2011 +0300
2.3 @@ -1,10 +1,10 @@
2.4 #! /bin/sh
2.5 # Attempt to guess a canonical system name.
2.6 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
2.7 -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
2.8 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
2.9 # Free Software Foundation, Inc.
2.10
2.11 -timestamp='2009-11-20'
2.12 +timestamp='2009-12-30'
2.13
2.14 # This file is free software; you can redistribute it and/or modify it
2.15 # under the terms of the GNU General Public License as published by
2.16 @@ -56,8 +56,9 @@
2.17 GNU config.guess ($timestamp)
2.18
2.19 Originally written by Per Bothner.
2.20 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
2.21 -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
2.22 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
2.23 +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
2.24 +Software Foundation, Inc.
2.25
2.26 This is free software; see the source for copying conditions. There is NO
2.27 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
3.1 --- a/test/test-automation/build-scripts/config.sub Fri Jul 01 13:29:19 2011 +0300
3.2 +++ b/test/test-automation/build-scripts/config.sub Fri Jul 01 17:11:20 2011 +0300
3.3 @@ -1,10 +1,10 @@
3.4 #! /bin/sh
3.5 # Configuration validation subroutine script.
3.6 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
3.7 -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
3.8 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
3.9 # Free Software Foundation, Inc.
3.10
3.11 -timestamp='2009-11-20'
3.12 +timestamp='2010-01-22'
3.13
3.14 # This file is (in principle) common to ALL GNU software.
3.15 # The presence of a machine in this file suggests that SOME GNU software
3.16 @@ -75,8 +75,9 @@
3.17 version="\
3.18 GNU config.sub ($timestamp)
3.19
3.20 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
3.21 -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
3.22 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
3.23 +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
3.24 +Software Foundation, Inc.
3.25
3.26 This is free software; see the source for copying conditions. There is NO
3.27 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
3.28 @@ -380,7 +381,8 @@
3.29 | sparclite-* \
3.30 | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
3.31 | tahoe-* | thumb-* \
3.32 - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
3.33 + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
3.34 + | tile-* | tilegx-* \
3.35 | tron-* \
3.36 | ubicom32-* \
3.37 | v850-* | v850e-* | vax-* \
3.38 @@ -1085,6 +1087,11 @@
3.39 basic_machine=tic6x-unknown
3.40 os=-coff
3.41 ;;
3.42 + # This must be matched before tile*.
3.43 + tilegx*)
3.44 + basic_machine=tilegx-unknown
3.45 + os=-linux-gnu
3.46 + ;;
3.47 tile*)
3.48 basic_machine=tile-unknown
3.49 os=-linux-gnu
3.50 @@ -1435,6 +1442,8 @@
3.51 -dicos*)
3.52 os=-dicos
3.53 ;;
3.54 + -nacl*)
3.55 + ;;
3.56 -none)
3.57 ;;
3.58 *)
4.1 --- a/test/test-automation/plain_logger.c Fri Jul 01 13:29:19 2011 +0300
4.2 +++ b/test/test-automation/plain_logger.c Fri Jul 01 17:11:20 2011 +0300
4.3 @@ -78,9 +78,9 @@
4.4 {
4.5 if(testResult) {
4.6 if(testResult == 2) {
4.7 - Output("%s: failed -> no assert");
4.8 + Output("%s: failed -> no assert", testName);
4.9 } else {
4.10 - Output("%s: failed");
4.11 + Output("%s: failed", testName);
4.12 }
4.13 } else {
4.14 Output("%s: ok", testName);
5.1 --- a/test/test-automation/testdummy/Makefile.am Fri Jul 01 13:29:19 2011 +0300
5.2 +++ b/test/test-automation/testdummy/Makefile.am Fri Jul 01 17:11:20 2011 +0300
5.3 @@ -1,5 +1,5 @@
5.4 lib_LTLIBRARIES = libtestdummy.la
5.5 -libtestdummy_la_SOURCES = testdummy.c ../SDL_test.c
5.6 +libtestdummy_la_SOURCES = testdummy.c ../SDL_test.c ../logger.c ../logger_helpers.c ../plain_logger.c ../xml_logger.c ../xml.c
5.7 libtestdummy_la_CLAGS = -fPIC -g
5.8 libtestdummy_la_LDFLAGS = `sdl-config --libs`
5.9
6.1 --- a/test/test-automation/testplatform/Makefile.am Fri Jul 01 13:29:19 2011 +0300
6.2 +++ b/test/test-automation/testplatform/Makefile.am Fri Jul 01 17:11:20 2011 +0300
6.3 @@ -1,5 +1,5 @@
6.4 lib_LTLIBRARIES = libtestplatform.la
6.5 -libtestplatform_la_SOURCES = testplatform.c ../SDL_test.c
6.6 +libtestplatform_la_SOURCES = testplatform.c ../SDL_test.c ../logger.c ../logger_helpers.c ../plain_logger.c ../xml_logger.c ../xml.c
6.7 libtestplatform_la_CLAGS = -fPIC -g
6.8 libtestplatform_la_LDFLAGS = `sdl-config --libs`
6.9
7.1 --- a/test/test-automation/testplatform/Makefile.in Fri Jul 01 13:29:19 2011 +0300
7.2 +++ b/test/test-automation/testplatform/Makefile.in Fri Jul 01 17:11:20 2011 +0300
7.3 @@ -73,7 +73,8 @@
7.4 am__installdirs = "$(DESTDIR)$(libdir)"
7.5 LTLIBRARIES = $(lib_LTLIBRARIES)
7.6 libtestplatform_la_LIBADD =
7.7 -am_libtestplatform_la_OBJECTS = testplatform.lo SDL_test.lo
7.8 +am_libtestplatform_la_OBJECTS = testplatform.lo SDL_test.lo logger.lo \
7.9 + logger_helpers.lo plain_logger.lo xml_logger.lo xml.lo
7.10 libtestplatform_la_OBJECTS = $(am_libtestplatform_la_OBJECTS)
7.11 libtestplatform_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
7.12 $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
7.13 @@ -208,7 +209,7 @@
7.14 top_builddir = @top_builddir@
7.15 top_srcdir = @top_srcdir@
7.16 lib_LTLIBRARIES = libtestplatform.la
7.17 -libtestplatform_la_SOURCES = testplatform.c ../SDL_test.c
7.18 +libtestplatform_la_SOURCES = testplatform.c ../SDL_test.c ../logger.c ../logger_helpers.c ../plain_logger.c ../xml_logger.c ../xml.c
7.19 libtestplatform_la_CLAGS = -fPIC -g
7.20 libtestplatform_la_LDFLAGS = `sdl-config --libs`
7.21 all: all-am
7.22 @@ -286,7 +287,12 @@
7.23 -rm -f *.tab.c
7.24
7.25 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SDL_test.Plo@am__quote@
7.26 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logger.Plo@am__quote@
7.27 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logger_helpers.Plo@am__quote@
7.28 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plain_logger.Plo@am__quote@
7.29 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testplatform.Plo@am__quote@
7.30 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xml.Plo@am__quote@
7.31 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xml_logger.Plo@am__quote@
7.32
7.33 .c.o:
7.34 @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
7.35 @@ -316,6 +322,41 @@
7.36 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
7.37 @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o SDL_test.lo `test -f '../SDL_test.c' || echo '$(srcdir)/'`../SDL_test.c
7.38
7.39 +logger.lo: ../logger.c
7.40 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT logger.lo -MD -MP -MF $(DEPDIR)/logger.Tpo -c -o logger.lo `test -f '../logger.c' || echo '$(srcdir)/'`../logger.c
7.41 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/logger.Tpo $(DEPDIR)/logger.Plo
7.42 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../logger.c' object='logger.lo' libtool=yes @AMDEPBACKSLASH@
7.43 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
7.44 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o logger.lo `test -f '../logger.c' || echo '$(srcdir)/'`../logger.c
7.45 +
7.46 +logger_helpers.lo: ../logger_helpers.c
7.47 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT logger_helpers.lo -MD -MP -MF $(DEPDIR)/logger_helpers.Tpo -c -o logger_helpers.lo `test -f '../logger_helpers.c' || echo '$(srcdir)/'`../logger_helpers.c
7.48 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/logger_helpers.Tpo $(DEPDIR)/logger_helpers.Plo
7.49 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../logger_helpers.c' object='logger_helpers.lo' libtool=yes @AMDEPBACKSLASH@
7.50 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
7.51 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o logger_helpers.lo `test -f '../logger_helpers.c' || echo '$(srcdir)/'`../logger_helpers.c
7.52 +
7.53 +plain_logger.lo: ../plain_logger.c
7.54 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT plain_logger.lo -MD -MP -MF $(DEPDIR)/plain_logger.Tpo -c -o plain_logger.lo `test -f '../plain_logger.c' || echo '$(srcdir)/'`../plain_logger.c
7.55 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/plain_logger.Tpo $(DEPDIR)/plain_logger.Plo
7.56 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../plain_logger.c' object='plain_logger.lo' libtool=yes @AMDEPBACKSLASH@
7.57 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
7.58 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o plain_logger.lo `test -f '../plain_logger.c' || echo '$(srcdir)/'`../plain_logger.c
7.59 +
7.60 +xml_logger.lo: ../xml_logger.c
7.61 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xml_logger.lo -MD -MP -MF $(DEPDIR)/xml_logger.Tpo -c -o xml_logger.lo `test -f '../xml_logger.c' || echo '$(srcdir)/'`../xml_logger.c
7.62 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xml_logger.Tpo $(DEPDIR)/xml_logger.Plo
7.63 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../xml_logger.c' object='xml_logger.lo' libtool=yes @AMDEPBACKSLASH@
7.64 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
7.65 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xml_logger.lo `test -f '../xml_logger.c' || echo '$(srcdir)/'`../xml_logger.c
7.66 +
7.67 +xml.lo: ../xml.c
7.68 +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xml.lo -MD -MP -MF $(DEPDIR)/xml.Tpo -c -o xml.lo `test -f '../xml.c' || echo '$(srcdir)/'`../xml.c
7.69 +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xml.Tpo $(DEPDIR)/xml.Plo
7.70 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../xml.c' object='xml.lo' libtool=yes @AMDEPBACKSLASH@
7.71 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
7.72 +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xml.lo `test -f '../xml.c' || echo '$(srcdir)/'`../xml.c
7.73 +
7.74 mostlyclean-libtool:
7.75 -rm -f *.lo
7.76
8.1 --- a/test/test-automation/testrect/Makefile.am Fri Jul 01 13:29:19 2011 +0300
8.2 +++ b/test/test-automation/testrect/Makefile.am Fri Jul 01 17:11:20 2011 +0300
8.3 @@ -1,5 +1,5 @@
8.4 lib_LTLIBRARIES = libtestrect.la
8.5 -libtestrect_la_SOURCES = testrect.c ../SDL_test.c
8.6 +libtestrect_la_SOURCES = testrect.c ../SDL_test.c ../logger.c ../logger_helpers.c ../plain_logger.c ../xml_logger.c ../xml.c
8.7 libtestrect_la_CLAGS = -fPIC -g
8.8 libtestrect_la_LDFLAGS = `sdl-config --libs`
8.9