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 discards 7a5c61ef4059b02a846cdce2e19943dd1150d261 (commit) via 8caa76a32fdad0cc36b1a4ac6038b205f17b504e (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (7a5c61ef4059b02a846cdce2e19943dd1150d261) N -- N -- N (8caa76a32fdad0cc36b1a4ac6038b205f17b504e) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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/8caa76a32fdad0cc36b1a4ac6038b205f17b5... commit 8caa76a32fdad0cc36b1a4ac6038b205f17b504e Author: Cyril Hrubis <metan@ucw.cz> Date: Sat Oct 13 20:07:08 2012 +0200 tests: loaders: Make use of some bmp images. diff --git a/tests/Makefile b/tests/Makefile index f4fc735..6181430 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -5,5 +5,6 @@ SUBDIRS=core SDL drivers framework loaders gfx loaders: framework gfx: framework +core: framework include $(TOPDIR)/post.mk diff --git a/tests/loaders/Makefile b/tests/loaders/Makefile index 8fb8b15..f076cd7 100644 --- a/tests/loaders/Makefile +++ b/tests/loaders/Makefile @@ -12,7 +12,7 @@ APPS=loaders_suite $(APPS): ../framework/libtst.a -CLEAN+=libtst_preload.so log.html log.json +CLEAN+=log.html log.json include $(TOPDIR)/app.mk include $(TOPDIR)/post.mk diff --git a/tests/loaders/loaders_suite.c b/tests/loaders/loaders_suite.c index aa2fa92..de84a8e 100644 --- a/tests/loaders/loaders_suite.c +++ b/tests/loaders/loaders_suite.c @@ -493,6 +493,74 @@ static int test_Load(void) return TST_SKIPPED; } +static int test_load_BMP(const char *path) +{ + GP_Context *img; + + img = GP_LoadBMP(path, NULL); + + if (img == NULL) { + switch (errno) { + case ENOSYS: + tst_report(0, "Not Implemented"); + return TST_SKIPPED; + default: + tst_report(0, "Got %s", strerror(errno)); + return TST_FAILED; + } + } + + /* + * TODO: check correct data. + */ + + GP_ContextFree(img); + + return TST_SUCCESS; +} + +/* Basic loading tests */ + +static int test_load_BMP_1bpp_1x1(void) +{ + return test_load_BMP("1bpp-1x1.bmp"); +} + +static int test_load_BMP_4bpp_1x1(void) +{ + return test_load_BMP("4bpp-1x1.bmp"); +} + +static int test_load_BMP_8bpp_1x1(void) +{ + return test_load_BMP("8bpp-1x1.bmp"); +} + +static int test_load_BMP_24bpp_1x1(void) +{ + return test_load_BMP("24bpp-1x1.bmp"); +} + +static int test_load_BMP_32bpp_1x1(void) +{ + return test_load_BMP("32bpp-1x1.bmp"); +} + +static int test_load_BMP_555_1x1(void) +{ + return test_load_BMP("555-1x1.bmp"); +} + +static int test_load_BMP_565_1x1(void) +{ + return test_load_BMP("565-1x1.bmp"); +} + +static int test_load_BMP_8bpp_1x64000(void) +{ + return test_load_BMP("8bpp-1x64000.bmp"); +} + const struct tst_suite tst_suite = { .suite_name = "Image Loaders testsuite", .tests = { @@ -545,7 +613,32 @@ const struct tst_suite tst_suite = { .flags = TST_TMPDIR | TST_CHECK_MALLOC}, {.name = "JPG Stress", .tst_fn = test_JPG_stress, .flags = TST_TMPDIR | TST_CHECK_MALLOC}, + + /* BPM loader tests */ + {.name = "BMP Load 1bpp 1x1", .tst_fn = test_load_BMP_1bpp_1x1, + .flags = TST_TMPDIR, .res_path = "data/bmp/bitmaps/valid/1bpp-1x1.bmp"}, + + {.name = "BMP Load 4bpp 1x1", .tst_fn = test_load_BMP_4bpp_1x1, + .flags = TST_TMPDIR, .res_path = "data/bmp/bitmaps/valid/4bpp-1x1.bmp"}, + {.name = "BMP Load 8bpp 1x1", .tst_fn = test_load_BMP_8bpp_1x1, + .flags = TST_TMPDIR, .res_path = "data/bmp/bitmaps/valid/8bpp-1x1.bmp"}, + + {.name = "BMP 24bpp 1x1", .tst_fn = test_load_BMP_24bpp_1x1, + .flags = TST_TMPDIR, .res_path = "data/bmp/bitmaps/valid/24bpp-1x1.bmp"}, + + {.name = "BMP 32bpp 1x1", .tst_fn = test_load_BMP_32bpp_1x1, + .flags = TST_TMPDIR, .res_path = "data/bmp/bitmaps/valid/32bpp-1x1.bmp"}, + + {.name = "BMP 555 1x1", .tst_fn = test_load_BMP_555_1x1, + .flags = TST_TMPDIR, .res_path = "data/bmp/bitmaps/valid/555-1x1.bmp"}, + + {.name = "BMP 565 1x1", .tst_fn = test_load_BMP_565_1x1, + .flags = TST_TMPDIR, .res_path = "data/bmp/bitmaps/valid/565-1x1.bmp"}, + + {.name = "BMP 8bpp 1x64000", .tst_fn = test_load_BMP_8bpp_1x64000, + .flags = TST_TMPDIR, .res_path = "data/bmp/bitmaps/valid/8bpp-1x64000.bmp"}, + {.name = NULL}, } }; ----------------------------------------------------------------------- Summary of changes: tests/loaders/loaders_suite.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) 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.")