From 343e28c84a4344d4adcb1f7b7ea185c1e9f0a501 Mon Sep 17 00:00:00 2001 From: Markus Kauppila Date: Wed, 1 Jun 2011 18:03:09 -0700 Subject: [PATCH] Ported testrect from original automation code, updated AssertEquals, added AssertTrue --- test/test-automation/Makefile.am | 4 +- test/test-automation/SDL_test.c | 51 ++- test/test-automation/SDL_test.h | 4 +- test/test-automation/configure.ac | 2 +- test/test-automation/runner.c | 2 +- test/test-automation/testrect/Makefile.am | 9 + test/test-automation/testrect/Makefile.in | 533 ++++++++++++++++++++++ test/test-automation/testrect/testrect.c | 137 ++++++ test/test-automation/tests/test.c | 4 +- 9 files changed, 731 insertions(+), 15 deletions(-) create mode 100644 test/test-automation/testrect/Makefile.am create mode 100644 test/test-automation/testrect/Makefile.in create mode 100644 test/test-automation/testrect/testrect.c diff --git a/test/test-automation/Makefile.am b/test/test-automation/Makefile.am index f12015ba9..27519768b 100644 --- a/test/test-automation/Makefile.am +++ b/test/test-automation/Makefile.am @@ -1,6 +1,6 @@ ACLOCAL_AMFLAGS = -I acinclude -I build-scripts -SUBDIRS = tests +SUBDIRS = tests testrect bin_PROGRAMS = runner runner_SOURCES = runner.c SDL_test.c @@ -11,6 +11,8 @@ install: install-tests install-tests: -cp -f tests/.libs/*.dylib tests/ 2> /dev/null -cp -f tests/.libs/*.so tests/ 2> /dev/null + -cp -f testrect/.libs/*.dylib tests/ 2> /dev/null + -cp -f testrect/.libs/*.so tests/ 2> /dev/null distclean-local: -rm -Rf docs/ diff --git a/test/test-automation/SDL_test.c b/test/test-automation/SDL_test.c index 32e0fd684..e5b489f7d 100644 --- a/test/test-automation/SDL_test.c +++ b/test/test-automation/SDL_test.c @@ -21,34 +21,67 @@ #ifndef _SDL_TEST_C #define _SDL_TEST_C +#include /* printf/fprintf */ +#include /* va_list */ + #include "SDL_test.h" /*! \brief return value of test case. Non-zero value means that the test failed */ static int _testReturnValue; +static int _testAssertsFailed; +static int _testAssertsPassed; + void TestCaseInit() { _testReturnValue = 0; + _testAssertsFailed = 0; + _testAssertsPassed = 0; } int TestCaseQuit() { + printf("Asserts: passed %d, failed %d\n", _testAssertsPassed, _testAssertsFailed); return _testReturnValue; } -void -AssertEquals(char *message, Uint32 expected, Uint32 actual) +void +AssertEquals(Uint32 expected, Uint32 actual, char* message, ...) { - if(expected != actual) { - printf("===============================\n"); - printf("Assert failed: %s\n", message); - printf("Expected %d, got %d\n", expected, actual); - printf("===============================\n"); - _testReturnValue = 1; - } + va_list args; + char buf[256]; + + if(expected != actual) { + va_start( args, message ); + SDL_vsnprintf( buf, sizeof(buf), message, args ); + va_end( args ); + printf("Assert Equals failed: expected %d, got %d; %s\n", expected, actual, buf); + _testReturnValue = 1; + _testAssertsFailed++; + } else { + _testAssertsPassed++; + } } +void +AssertTrue(int condition, char *message, ...) +{ + va_list args; + char buf[256]; + + if (!condition) { + va_start( args, message ); + SDL_vsnprintf( buf, sizeof(buf), message, args ); + va_end( args ); + + printf("Assert IsTrue failed: %s\n", buf); + _testReturnValue = 1; + _testAssertsFailed++; + } else { + _testAssertsPassed++; + } +} #endif diff --git a/test/test-automation/SDL_test.h b/test/test-automation/SDL_test.h index 5a06ebbae..68684d3bf 100644 --- a/test/test-automation/SDL_test.h +++ b/test/test-automation/SDL_test.h @@ -53,6 +53,8 @@ void TestCaseInit(); int TestCaseQuit(); -void AssertEquals(char *message, Uint32 expected, Uint32 actual); +void AssertEquals(Uint32 expected, Uint32 actual, char *message, ...); + +void AssertTrue(int condition, char *message, ...); #endif diff --git a/test/test-automation/configure.ac b/test/test-automation/configure.ac index 44b7a9f22..0547829a9 100644 --- a/test/test-automation/configure.ac +++ b/test/test-automation/configure.ac @@ -33,7 +33,7 @@ CFLAGS="-g" AC_FUNC_FORK AC_CONFIG_FILES([Makefile - tests/Makefile]) + tests/Makefile testrect/Makefile]) AC_OUTPUT echo "" diff --git a/test/test-automation/runner.c b/test/test-automation/runner.c index 524e95dab..d624f77b2 100644 --- a/test/test-automation/runner.c +++ b/test/test-automation/runner.c @@ -48,7 +48,7 @@ ScanForTestSuites() { #if defined(linux) || defined( __linux) char *libName = "tests/libtest.so"; #else - char *libName = "tests/libtest.dylib"; + char *libName = "tests/libtestrect.dylib"; #endif return libName; } diff --git a/test/test-automation/testrect/Makefile.am b/test/test-automation/testrect/Makefile.am new file mode 100644 index 000000000..8ba4ab2d1 --- /dev/null +++ b/test/test-automation/testrect/Makefile.am @@ -0,0 +1,9 @@ +lib_LTLIBRARIES = libtestrect.la +libtestrect_la_SOURCES = testrect.c ../SDL_test.c +libtestrect_la_CLAGS = -fPIC -g +libtestrect_la_LDFLAGS = `sdl-config --libs` + +distclean-local: + -rm *.dylib + -rm *.so + diff --git a/test/test-automation/testrect/Makefile.in b/test/test-automation/testrect/Makefile.in new file mode 100644 index 000000000..ae86900cb --- /dev/null +++ b/test/test-automation/testrect/Makefile.in @@ -0,0 +1,533 @@ +# Makefile.in generated by automake 1.11.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = testrect +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude/libtool.m4 \ + $(top_srcdir)/acinclude/ltoptions.m4 \ + $(top_srcdir)/acinclude/ltsugar.m4 \ + $(top_srcdir)/acinclude/ltversion.m4 \ + $(top_srcdir)/acinclude/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__installdirs = "$(DESTDIR)$(libdir)" +LTLIBRARIES = $(lib_LTLIBRARIES) +libtestrect_la_LIBADD = +am_libtestrect_la_OBJECTS = testrect.lo SDL_test.lo +libtestrect_la_OBJECTS = $(am_libtestrect_la_OBJECTS) +libtestrect_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libtestrect_la_LDFLAGS) $(LDFLAGS) -o $@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/build-scripts/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +SOURCES = $(libtestrect_la_SOURCES) +DIST_SOURCES = $(libtestrect_la_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GREP = @GREP@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +lib_LTLIBRARIES = libtestrect.la +libtestrect_la_SOURCES = testrect.c ../SDL_test.c +libtestrect_la_CLAGS = -fPIC -g +libtestrect_la_LDFLAGS = `sdl-config --libs` +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu testrect/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu testrect/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ + } + +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ + done + +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libtestrect.la: $(libtestrect_la_OBJECTS) $(libtestrect_la_DEPENDENCIES) + $(libtestrect_la_LINK) -rpath $(libdir) $(libtestrect_la_OBJECTS) $(libtestrect_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SDL_test.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testrect.Plo@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< + +.c.obj: +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + +SDL_test.lo: ../SDL_test.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT SDL_test.lo -MD -MP -MF $(DEPDIR)/SDL_test.Tpo -c -o SDL_test.lo `test -f '../SDL_test.c' || echo '$(srcdir)/'`../SDL_test.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/SDL_test.Tpo $(DEPDIR)/SDL_test.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../SDL_test.c' object='SDL_test.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@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 + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: + for dir in "$(DESTDIR)$(libdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-local distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: install-libLTLIBRARIES + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-libLTLIBRARIES + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libLTLIBRARIES clean-libtool ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-local distclean-tags distdir dvi dvi-am html html-am \ + info info-am install install-am install-data install-data-am \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-libLTLIBRARIES install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-libLTLIBRARIES + + +distclean-local: + -rm *.dylib + -rm *.so + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/test/test-automation/testrect/testrect.c b/test/test-automation/testrect/testrect.c new file mode 100644 index 000000000..b54b7a29f --- /dev/null +++ b/test/test-automation/testrect/testrect.c @@ -0,0 +1,137 @@ +/** + * Original code: automated SDL rect test written by Edgar Simo "bobbens" + */ + +#include + +#include + +#include "../SDL_test.h" + +/* Test cases */ +static const TestCaseReference test1 = + (TestCaseReference){ "rect_testIntersectRectAndLine", "description", TEST_ENABLED, 0 }; + +/* Test suite */ +extern const TestCaseReference *testSuite[] = { + &test1, NULL +}; + +TestCaseReference **QueryTestSuite() { + return (TestCaseReference **)testSuite; +} + +/** + * @brief Tests SDL_IntersectRectAndLine() + */ +int rect_testIntersectRectAndLine (void *arg) +{ + SDL_Rect rect = { 0, 0, 32, 32 }; + int x1, y1; + int x2, y2; + SDL_bool clipped; + + TestCaseInit(); + + x1 = -10; + y1 = 0; + x2 = -10; + y2 = 31; + clipped = SDL_IntersectRectAndLine(&rect, &x1, &y1, &x2, &y2); + AssertTrue( !clipped && + x1 == -10 && y1 == 0 && x2 == -10 && y2 == 31, + "line outside to the left was incorrectly clipped: %d,%d - %d,%d", + x1, y1, x2, y2); + + x1 = 40; + y1 = 0; + x2 = 40; + y2 = 31; + clipped = SDL_IntersectRectAndLine(&rect, &x1, &y1, &x2, &y2); + AssertTrue( !clipped && + x1 == 40 && y1 == 0 && x2 == 40 && y2 == 31, + "line outside to the right was incorrectly clipped: %d,%d - %d,%d", + x1, y1, x2, y2); + + x1 = 0; + y1 = -10; + x2 = 31; + y2 = -10; + clipped = SDL_IntersectRectAndLine(&rect, &x1, &y1, &x2, &y2); + AssertTrue( !clipped && + x1 == 0 && y1 == -10 && x2 == 31 && y2 == -10, + "line outside above was incorrectly clipped: %d,%d - %d,%d", + x1, y1, x2, y2); + + x1 = 0; + y1 = 40; + x2 = 31; + y2 = 40; + clipped = SDL_IntersectRectAndLine(&rect, &x1, &y1, &x2, &y2); + AssertTrue( !clipped && + x1 == 0 && y1 == 40 && x2 == 31 && y2 == 40, + "line outside below was incorrectly clipped: %d,%d - %d,%d", + x1, y1, x2, y2); + + x1 = 0; + y1 = 0; + x2 = 31; + y2 = 31; + clipped = SDL_IntersectRectAndLine(&rect, &x1, &y1, &x2, &y2); + AssertTrue( clipped && + x1 == 0 && y1 == 0 && x2 == 31 && y2 == 31, + "line fully inside rect was clipped: %d,%d - %d,%d", + x1, y1, x2, y2); + + x1 = -10; + y1 = 15; + x2 = 40; + y2 = 15; + clipped = SDL_IntersectRectAndLine(&rect, &x1, &y1, &x2, &y2); + AssertTrue( clipped && + x1 == 0 && y1 == 15 && x2 == 31 && y2 == 15, + "horizontal line rect was incorrectly clipped: %d,%d - %d,%d", + x1, y1, x2, y2); + + x1 = -32; + y1 = -32; + x2 = 63; + y2 = 63; + clipped = SDL_IntersectRectAndLine(&rect, &x1, &y1, &x2, &y2); + AssertTrue( clipped && + x1 == 0 && y1 == 0 && x2 == 31 && y2 == 31, + "diagonal line to lower right was incorrectly clipped: %d,%d - %d,%d", + x1, y1, x2, y2); + + x1 = 63; + y1 = 63; + x2 = -32; + y2 = -32; + clipped = SDL_IntersectRectAndLine(&rect, &x1, &y1, &x2, &y2); + AssertTrue( clipped && + x1 == 31 && y1 == 31 && x2 == 0 && y2 == 0, + "diagonal line to upper left was incorrectly clipped: %d,%d - %d,%d", + x1, y1, x2, y2); + + x1 = 63; + y1 = -32; + x2 = -32; + y2 = 63; + clipped = SDL_IntersectRectAndLine(&rect, &x1, &y1, &x2, &y2); + AssertTrue( clipped && + x1 == 31 && y1 == 0 && x2 == 0 && y2 == 31, + "diagonal line to lower left was incorrectly clipped: %d,%d - %d,%d", + x1, y1, x2, y2); + + x1 = -32; + y1 = 63; + x2 = 63; + y2 = -32; + clipped = SDL_IntersectRectAndLine(&rect, &x1, &y1, &x2, &y2); + AssertTrue( clipped && + x1 == 0 && y1 == 31 && x2 == 31 && y2 == 0, + "diagonal line to upper right was incorrectly clipped: %d,%d - %d,%d", + x1, y1, x2, y2); + + return TestCaseQuit(); +} diff --git a/test/test-automation/tests/test.c b/test/test-automation/tests/test.c index a754a45e6..d2e485de1 100644 --- a/test/test-automation/tests/test.c +++ b/test/test-automation/tests/test.c @@ -55,7 +55,7 @@ int hello(void *arg) const char *revision = SDL_GetRevision(); printf("Revision is %s\n", revision); - AssertEquals("will fail", 3, 5); + AssertEquals(3, 5, "fails"); return TestCaseQuit(); } @@ -75,7 +75,7 @@ int hello3(void *arg) TestCaseInit(); printf("hello3\n"); - AssertEquals("passes", 3, 3); + AssertEquals(3, 3, "passes"); return TestCaseQuit(); }