This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via 472dae1467a2add6bd116bd024c68ff6a5557534 (commit) via 3524e835e17a0775ecb2e86f9eca90885b16368a (commit) from fccae75f5221a0307cb52a5e8d7aa6cf820ec6df (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/472dae1467a2add6bd116bd024c68ff6a5557... commit 472dae1467a2add6bd116bd024c68ff6a5557534 Author: Cyril Hrubis <metan@ucw.cz> Date: Sun Oct 14 11:48:06 2012 +0200 tests: Move common Makefile constants into one place. This also adds -lrt which is needed for clock_gettime on some glibc versions. diff --git a/tests/core/Makefile b/tests/core/Makefile index bafa3c2..f030894 100644 --- a/tests/core/Makefile +++ b/tests/core/Makefile @@ -7,18 +7,11 @@ include $(TOPDIR)/pre.mk # hack LIBNAME=core -LDFLAGS+=-L../framework/ -L$(TOPDIR)/build/ -LDLIBS+=$(shell $(TOPDIR)/gfxprim-config --libs --libs-loaders) -LDLIBS+=-ltst_preload -ldl -ltst -CFLAGS+=-I../framework/ - GENSOURCES+=WritePixel_testsuite.gen.c APPS=WritePixel_testsuite.gen -$(APPS): ../framework/libtst.a - -CLEAN+=log.html log.json +include ../tests.mk include $(TOPDIR)/gen.mk include $(TOPDIR)/app.mk diff --git a/tests/framework/Makefile b/tests/framework/Makefile index 7169bb7..f3e22a1 100644 --- a/tests/framework/Makefile +++ b/tests/framework/Makefile @@ -5,7 +5,7 @@ CSOURCES=$(shell echo *.c) INCLUDE= LDFLAGS+=-L. -LDLIBS+=-ltst_preload -ldl -ltst +LDLIBS+=-ltst_preload -ldl -ltst -lrt CFLAGS+= test: libtst.a diff --git a/tests/gfx/Makefile b/tests/gfx/Makefile index ec97b78..71e9223 100644 --- a/tests/gfx/Makefile +++ b/tests/gfx/Makefile @@ -3,16 +3,9 @@ include $(TOPDIR)/pre.mk CSOURCES=$(shell echo *.c) -LDFLAGS+=-L../framework/ -L$(TOPDIR)/build/ -LDLIBS+=$(shell $(TOPDIR)/gfxprim-config --libs --libs-loaders) -LDLIBS+=-ltst_preload -ldl -ltst -CFLAGS+=-I../framework/ - APPS=gfx_benchmark -$(APPS): ../framework/libtst.a - -CLEAN+=log.html log.json +include ../tests.mk include $(TOPDIR)/app.mk include $(TOPDIR)/post.mk diff --git a/tests/loaders/Makefile b/tests/loaders/Makefile index f076cd7..9497586 100644 --- a/tests/loaders/Makefile +++ b/tests/loaders/Makefile @@ -3,16 +3,9 @@ include $(TOPDIR)/pre.mk CSOURCES=$(shell echo *.c) -LDFLAGS+=-L../framework/ -L$(TOPDIR)/build/ -LDLIBS+=$(shell $(TOPDIR)/gfxprim-config --libs --libs-loaders) -LDLIBS+=-ltst_preload -ldl -ltst -CFLAGS+=-I../framework/ - APPS=loaders_suite -$(APPS): ../framework/libtst.a - -CLEAN+=log.html log.json +include ../tests.mk include $(TOPDIR)/app.mk include $(TOPDIR)/post.mk diff --git a/tests/gfx/Makefile b/tests/tests.mk similarity index 52% copy from tests/gfx/Makefile copy to tests/tests.mk index ec97b78..f2d8eef 100644 --- a/tests/gfx/Makefile +++ b/tests/tests.mk @@ -1,18 +1,10 @@ -TOPDIR=../.. -include $(TOPDIR)/pre.mk - -CSOURCES=$(shell echo *.c) +# Constants for tests build LDFLAGS+=-L../framework/ -L$(TOPDIR)/build/ LDLIBS+=$(shell $(TOPDIR)/gfxprim-config --libs --libs-loaders) -LDLIBS+=-ltst_preload -ldl -ltst +LDLIBS+=-ltst_preload -ldl -ltst -lrt CFLAGS+=-I../framework/ -APPS=gfx_benchmark - $(APPS): ../framework/libtst.a CLEAN+=log.html log.json - -include $(TOPDIR)/app.mk -include $(TOPDIR)/post.mk http://repo.or.cz/w/gfxprim.git/commit/3524e835e17a0775ecb2e86f9eca90885b163... commit 3524e835e17a0775ecb2e86f9eca90885b16368a Author: Cyril Hrubis <metan@ucw.cz> Date: Sat Oct 13 20:29:20 2012 +0200 tests: Remove now unused files. diff --git a/tests/core_old/GP_Blit.test.c b/tests/core_old/GP_Blit.test.c deleted file mode 100644 index cc20992..0000000 --- a/tests/core_old/GP_Blit.test.c +++ /dev/null @@ -1,28 +0,0 @@ -/***************************************************************************** - * This file is part of gfxprim library. * - * * - * Gfxprim is free software; you can redistribute it and/or * - * modify it under the terms of the GNU Lesser General Public * - * License as published by the Free Software Foundation; either * - * version 2.1 of the License, or (at your option) any later version. * - * * - * Gfxprim 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 * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with gfxprim; if not, write to the Free Software * - * Foundation, Inc., 51 Franklin Street, Fifth Floor, * - * Boston, MA 02110-1301 USA * - * * - * Copyright (C) 2011 Tomas Gavenciak <gavento@ucw.cz> * - * * - *****************************************************************************/ - -#include <GP_Tests.h> -#include <GP_Common.h> -#include <unistd.h> - -GP_SUITE(GP_Blit) - diff --git a/tests/core_old/GP_WritePixel.test.gen.c.t b/tests/core_old/GP_WritePixel.test.gen.c.t deleted file mode 100644 index e488ce7..0000000 --- a/tests/core_old/GP_WritePixel.test.gen.c.t +++ /dev/null @@ -1,76 +0,0 @@ -%% extends "base.test.c.t" - -%% block body -#include "GP_Tests.h" -#include "GP_WritePixel.h" -#include "GP_TestingCore.h" - -GP_SUITE(GP_WritePixel) - -static void dump_buffer(const char *name, char *buf, unsigned int buf_len) -{ - unsigned int i; - - printf("%s:n{", name); - - for (i = 0; i < buf_len; i++) { - printf("%i", !!buf[i]); - - if (i != buf_len - 1) - printf(", "); - - if (i % 26 == 25) - printf("n "); - } - - printf("}n"); -} - -/* - * Compares two statically defined buffers - */ -#define COMPARE_BUFFERS(id, buf1, buf2) do { - unsigned int buf1_len = sizeof(buf1)/sizeof(*buf1); - unsigned int buf2_len = sizeof(buf2)/sizeof(*buf2); - unsigned int i; - - fail_unless(buf1_len == buf2_len); - - for (i = 0; i < buf1_len; i++) - if(buf1[i] != buf2[i]) { - printf("%sn", id); - dump_buffer("wrote", buf1, buf1_len); - dump_buffer("gen", buf2, buf2_len); - fail("buffers are different"); - } -} while (0) - -%% for pixelsize in [8, 16, 24, 32] -%% for offset in range(0, 4) -%% for len in range(0, 6) -%% for aligment in [0, 1] -GP_TEST(GP_WritePixel{{ "%i_%i_%i_%i"|format(pixelsize, offset, len, aligment) }}, {{ ""offset=%i, len=%i, aligment=%i,""|format(offset, len, aligment) }}) -{ - char write_buf[{{ 25 * pixelsize//8 }}] = {}; - char gen_buf[{{ 25 * pixelsize//8 }}] = {}; - - /* - * Fill the compare buffer - */ -%% for i in range(0, len) -%% for j in range(0, pixelsize//8) - gen_buf[{{aligment + offset * pixelsize//8 + i * pixelsize//8 + j}}] = 0xff; -%% endfor -%% endfor - - GP_WritePixels{{ pixelsize }}bpp(write_buf + {{aligment + offset * pixelsize//8}}, {{ len }}, 0xffffffff>>{{32 - pixelsize}}); - - COMPARE_BUFFERS({{""p=%i o=%i l=%i a=%i""|format(pixelsize, offset, len, aligment)}}, write_buf, gen_buf); -} -GP_ENDTEST -%% endfor -%% endfor -%% endfor -%% endfor - -%% endblock body diff --git a/tests/core_old/Makefile b/tests/core_old/Makefile deleted file mode 100644 index c848cb0..0000000 --- a/tests/core_old/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -TOPDIR=../.. - -include $(TOPDIR)/pre.mk - -LIBNAME=core -TESTSUITE=core_suite -LDLIBS+=-lGP -L$(TOPDIR)/build/ -lcheck -lm -lSDL -GENSOURCES+=GP_Convert.test.gen.c GP_WritePixel.test.gen.c - GP_MixPixels.test.gen.c - -all: $(TESTSUITE) - -include $(TOPDIR)/tests.mk -include $(TOPDIR)/post.mk - ----------------------------------------------------------------------- Summary of changes: tests/core/Makefile | 9 +--- tests/core_old/GP_Blit.test.c | 28 ----------- tests/core_old/GP_WritePixel.test.gen.c.t | 76 ----------------------------- tests/core_old/Makefile | 15 ------ tests/framework/Makefile | 2 +- tests/gfx/Makefile | 9 +--- tests/loaders/Makefile | 9 +--- tests/{gfx/Makefile => tests.mk} | 12 +---- 8 files changed, 6 insertions(+), 154 deletions(-) delete mode 100644 tests/core_old/GP_Blit.test.c delete mode 100644 tests/core_old/GP_WritePixel.test.gen.c.t delete mode 100644 tests/core_old/Makefile copy tests/{gfx/Makefile => tests.mk} (52%) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos@gmail.com if you want to unsubscribe, or site admin admin@repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")