diff options
-rw-r--r-- | Makefile | 6 | ||||
-rwxr-xr-x | examples/bmp_display (renamed from bmp_display) | 0 | ||||
-rwxr-xr-x | examples/ico_display (renamed from ico_display) | 0 | ||||
-rw-r--r-- | test/Makefile | 3 | ||||
-rw-r--r-- | test/bmpsuite/g01bg.bmp (renamed from examples/bmpsuite/g01bg.bmp) | bin | 1086 -> 1086 bytes | |||
-rw-r--r-- | test/bmpsuite/g01bw.bmp (renamed from examples/bmpsuite/g01bw.bmp) | bin | 1086 -> 1086 bytes | |||
-rw-r--r-- | test/bmpsuite/g01p1.bmp (renamed from examples/bmpsuite/g01p1.bmp) | bin | 1082 -> 1082 bytes | |||
-rw-r--r-- | test/bmpsuite/g01wb.bmp (renamed from examples/bmpsuite/g01wb.bmp) | bin | 1086 -> 1086 bytes | |||
-rw-r--r-- | test/bmpsuite/g04.bmp (renamed from examples/bmpsuite/g04.bmp) | bin | 4214 -> 4214 bytes | |||
-rw-r--r-- | test/bmpsuite/g04p4.bmp (renamed from examples/bmpsuite/g04p4.bmp) | bin | 4166 -> 4166 bytes | |||
-rw-r--r-- | test/bmpsuite/g04rle.bmp (renamed from examples/bmpsuite/g04rle.bmp) | bin | 922 -> 922 bytes | |||
-rw-r--r-- | test/bmpsuite/g08.bmp (renamed from examples/bmpsuite/g08.bmp) | bin | 9270 -> 9270 bytes | |||
-rw-r--r-- | test/bmpsuite/g08offs.bmp (renamed from examples/bmpsuite/g08offs.bmp) | bin | 9370 -> 9370 bytes | |||
-rw-r--r-- | test/bmpsuite/g08os2.bmp (renamed from examples/bmpsuite/g08os2.bmp) | bin | 8986 -> 8986 bytes | |||
-rw-r--r-- | test/bmpsuite/g08p256.bmp (renamed from examples/bmpsuite/g08p256.bmp) | bin | 9270 -> 9270 bytes | |||
-rw-r--r-- | test/bmpsuite/g08p64.bmp (renamed from examples/bmpsuite/g08p64.bmp) | bin | 8502 -> 8502 bytes | |||
-rw-r--r-- | test/bmpsuite/g08pi256.bmp (renamed from examples/bmpsuite/g08pi256.bmp) | bin | 9270 -> 9270 bytes | |||
-rw-r--r-- | test/bmpsuite/g08pi64.bmp (renamed from examples/bmpsuite/g08pi64.bmp) | bin | 9270 -> 9270 bytes | |||
-rw-r--r-- | test/bmpsuite/g08res11.bmp (renamed from examples/bmpsuite/g08res11.bmp) | bin | 9270 -> 9270 bytes | |||
-rw-r--r-- | test/bmpsuite/g08res21.bmp (renamed from examples/bmpsuite/g08res21.bmp) | bin | 9270 -> 9270 bytes | |||
-rw-r--r-- | test/bmpsuite/g08res22.bmp (renamed from examples/bmpsuite/g08res22.bmp) | bin | 9270 -> 9270 bytes | |||
-rw-r--r-- | test/bmpsuite/g08rle.bmp (renamed from examples/bmpsuite/g08rle.bmp) | bin | 1820 -> 1820 bytes | |||
-rw-r--r-- | test/bmpsuite/g08s0.bmp (renamed from examples/bmpsuite/g08s0.bmp) | bin | 9270 -> 9270 bytes | |||
-rw-r--r-- | test/bmpsuite/g08w124.bmp (renamed from examples/bmpsuite/g08w124.bmp) | bin | 8642 -> 8642 bytes | |||
-rw-r--r-- | test/bmpsuite/g08w125.bmp (renamed from examples/bmpsuite/g08w125.bmp) | bin | 9014 -> 9014 bytes | |||
-rw-r--r-- | test/bmpsuite/g08w126.bmp (renamed from examples/bmpsuite/g08w126.bmp) | bin | 9142 -> 9142 bytes | |||
-rw-r--r-- | test/bmpsuite/g16bf555.bmp (renamed from examples/bmpsuite/g16bf555.bmp) | bin | 16450 -> 16450 bytes | |||
-rw-r--r-- | test/bmpsuite/g16bf565.bmp (renamed from examples/bmpsuite/g16bf565.bmp) | bin | 16450 -> 16450 bytes | |||
-rw-r--r-- | test/bmpsuite/g16def555.bmp (renamed from examples/bmpsuite/g16def555.bmp) | bin | 16438 -> 16438 bytes | |||
-rw-r--r-- | test/bmpsuite/g24.bmp (renamed from examples/bmpsuite/g24.bmp) | bin | 24630 -> 24630 bytes | |||
-rw-r--r-- | test/bmpsuite/g32bf.bmp (renamed from examples/bmpsuite/g32bf.bmp) | bin | 32578 -> 32578 bytes | |||
-rw-r--r-- | test/bmpsuite/g32def.bmp (renamed from examples/bmpsuite/g32def.bmp) | bin | 32566 -> 32566 bytes | |||
-rw-r--r-- | test/bmpsuite/png/01bg.png (renamed from examples/bmpsuite/png/01bg.png) | bin | 281 -> 281 bytes | |||
-rw-r--r-- | test/bmpsuite/png/01bw.png (renamed from examples/bmpsuite/png/01bw.png) | bin | 281 -> 281 bytes | |||
-rw-r--r-- | test/bmpsuite/png/01p1.png (renamed from examples/bmpsuite/png/01p1.png) | bin | 139 -> 139 bytes | |||
-rw-r--r-- | test/bmpsuite/png/04.png (renamed from examples/bmpsuite/png/04.png) | bin | 280 -> 280 bytes | |||
-rw-r--r-- | test/bmpsuite/png/04p4.png (renamed from examples/bmpsuite/png/04p4.png) | bin | 223 -> 223 bytes | |||
-rw-r--r-- | test/bmpsuite/png/08.png (renamed from examples/bmpsuite/png/08.png) | bin | 1447 -> 1447 bytes | |||
-rw-r--r-- | test/bmpsuite/png/08p64.png (renamed from examples/bmpsuite/png/08p64.png) | bin | 694 -> 694 bytes | |||
-rw-r--r-- | test/bmpsuite/png/08w124.png (renamed from examples/bmpsuite/png/08w124.png) | bin | 1434 -> 1434 bytes | |||
-rw-r--r-- | test/bmpsuite/png/08w125.png (renamed from examples/bmpsuite/png/08w125.png) | bin | 1450 -> 1450 bytes | |||
-rw-r--r-- | test/bmpsuite/png/08w126.png (renamed from examples/bmpsuite/png/08w126.png) | bin | 1461 -> 1461 bytes | |||
-rw-r--r-- | test/bmpsuite/png/16bf555.png (renamed from examples/bmpsuite/png/16bf555.png) | bin | 525 -> 525 bytes | |||
-rw-r--r-- | test/bmpsuite/png/16bf565.png (renamed from examples/bmpsuite/png/16bf565.png) | bin | 580 -> 580 bytes | |||
-rw-r--r-- | test/bmpsuite/png/24.png (renamed from examples/bmpsuite/png/24.png) | bin | 433 -> 433 bytes | |||
-rw-r--r-- | test/bmpsuite/png/reference.html (renamed from examples/bmpsuite/png/reference.html) | 0 | ||||
-rw-r--r-- | test/bmpsuite/readme.txt (renamed from examples/bmpsuite/readme.txt) | 0 | ||||
-rw-r--r-- | test/bmpsuite/test.html (renamed from examples/bmpsuite/test.html) | 0 | ||||
-rw-r--r-- | test/decode_bmp.c (renamed from examples/decode_bmp.c) | 0 | ||||
-rw-r--r-- | test/decode_ico.c (renamed from examples/decode_ico.c) | 0 | ||||
-rw-r--r-- | test/icons/monitor.ico (renamed from examples/monitor.ico) | bin | 102758 -> 102758 bytes | |||
-rwxr-xr-x | test/runtest.sh | 26 |
52 files changed, 35 insertions, 0 deletions
@@ -15,6 +15,9 @@ PREFIX ?= /opt/netsurf NSSHARED ?= $(PREFIX)/share/netsurf-buildsystem include $(NSSHARED)/makefiles/Makefile.tools +# Reevaluate when used, as BUILDDIR won't be defined yet +TESTRUNNER = test/runtest.sh $(BUILDDIR) $(EXEEXT) + # Toolchain flags WARNFLAGS := -Wall -W -Wundef -Wpointer-arith -Wcast-align \ -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \ @@ -34,6 +37,9 @@ else CFLAGS := $(CFLAGS) -Dinline="__inline__" endif +TESTCFLAGS := -g -O2 +TESTLDFLAGS := -lm -l$(COMPONENT) $(TESTLDFLAGS) + include $(NSBUILD)/Makefile.top # Extra installation rules diff --git a/bmp_display b/examples/bmp_display index dd0458c..dd0458c 100755 --- a/bmp_display +++ b/examples/bmp_display diff --git a/ico_display b/examples/ico_display index ff5cd3c..ff5cd3c 100755 --- a/ico_display +++ b/examples/ico_display diff --git a/test/Makefile b/test/Makefile new file mode 100644 index 0000000..6c73a91 --- /dev/null +++ b/test/Makefile @@ -0,0 +1,3 @@ +DIR_TEST_ITEMS := decode_bmp:decode_bmp.c decode_ico:decode_ico.c + +include $(NSBUILD)/Makefile.subdir diff --git a/examples/bmpsuite/g01bg.bmp b/test/bmpsuite/g01bg.bmp Binary files differindex a720347..a720347 100644 --- a/examples/bmpsuite/g01bg.bmp +++ b/test/bmpsuite/g01bg.bmp diff --git a/examples/bmpsuite/g01bw.bmp b/test/bmpsuite/g01bw.bmp Binary files differindex 06189a6..06189a6 100644 --- a/examples/bmpsuite/g01bw.bmp +++ b/test/bmpsuite/g01bw.bmp diff --git a/examples/bmpsuite/g01p1.bmp b/test/bmpsuite/g01p1.bmp Binary files differindex 706b4a1..706b4a1 100644 --- a/examples/bmpsuite/g01p1.bmp +++ b/test/bmpsuite/g01p1.bmp diff --git a/examples/bmpsuite/g01wb.bmp b/test/bmpsuite/g01wb.bmp Binary files differindex 2f05b43..2f05b43 100644 --- a/examples/bmpsuite/g01wb.bmp +++ b/test/bmpsuite/g01wb.bmp diff --git a/examples/bmpsuite/g04.bmp b/test/bmpsuite/g04.bmp Binary files differindex a064f66..a064f66 100644 --- a/examples/bmpsuite/g04.bmp +++ b/test/bmpsuite/g04.bmp diff --git a/examples/bmpsuite/g04p4.bmp b/test/bmpsuite/g04p4.bmp Binary files differindex 4c1096b..4c1096b 100644 --- a/examples/bmpsuite/g04p4.bmp +++ b/test/bmpsuite/g04p4.bmp diff --git a/examples/bmpsuite/g04rle.bmp b/test/bmpsuite/g04rle.bmp Binary files differindex 7239fa6..7239fa6 100644 --- a/examples/bmpsuite/g04rle.bmp +++ b/test/bmpsuite/g04rle.bmp diff --git a/examples/bmpsuite/g08.bmp b/test/bmpsuite/g08.bmp Binary files differindex 3be9a20..3be9a20 100644 --- a/examples/bmpsuite/g08.bmp +++ b/test/bmpsuite/g08.bmp diff --git a/examples/bmpsuite/g08offs.bmp b/test/bmpsuite/g08offs.bmp Binary files differindex 71def41..71def41 100644 --- a/examples/bmpsuite/g08offs.bmp +++ b/test/bmpsuite/g08offs.bmp diff --git a/examples/bmpsuite/g08os2.bmp b/test/bmpsuite/g08os2.bmp Binary files differindex f7f9f57..f7f9f57 100644 --- a/examples/bmpsuite/g08os2.bmp +++ b/test/bmpsuite/g08os2.bmp diff --git a/examples/bmpsuite/g08p256.bmp b/test/bmpsuite/g08p256.bmp Binary files differindex a129bbc..a129bbc 100644 --- a/examples/bmpsuite/g08p256.bmp +++ b/test/bmpsuite/g08p256.bmp diff --git a/examples/bmpsuite/g08p64.bmp b/test/bmpsuite/g08p64.bmp Binary files differindex 9d3affd..9d3affd 100644 --- a/examples/bmpsuite/g08p64.bmp +++ b/test/bmpsuite/g08p64.bmp diff --git a/examples/bmpsuite/g08pi256.bmp b/test/bmpsuite/g08pi256.bmp Binary files differindex 45df3f8..45df3f8 100644 --- a/examples/bmpsuite/g08pi256.bmp +++ b/test/bmpsuite/g08pi256.bmp diff --git a/examples/bmpsuite/g08pi64.bmp b/test/bmpsuite/g08pi64.bmp Binary files differindex 52baf91..52baf91 100644 --- a/examples/bmpsuite/g08pi64.bmp +++ b/test/bmpsuite/g08pi64.bmp diff --git a/examples/bmpsuite/g08res11.bmp b/test/bmpsuite/g08res11.bmp Binary files differindex f03d0f3..f03d0f3 100644 --- a/examples/bmpsuite/g08res11.bmp +++ b/test/bmpsuite/g08res11.bmp diff --git a/examples/bmpsuite/g08res21.bmp b/test/bmpsuite/g08res21.bmp Binary files differindex 61198e5..61198e5 100644 --- a/examples/bmpsuite/g08res21.bmp +++ b/test/bmpsuite/g08res21.bmp diff --git a/examples/bmpsuite/g08res22.bmp b/test/bmpsuite/g08res22.bmp Binary files differindex 1af0ecc..1af0ecc 100644 --- a/examples/bmpsuite/g08res22.bmp +++ b/test/bmpsuite/g08res22.bmp diff --git a/examples/bmpsuite/g08rle.bmp b/test/bmpsuite/g08rle.bmp Binary files differindex 082f7f4..082f7f4 100644 --- a/examples/bmpsuite/g08rle.bmp +++ b/test/bmpsuite/g08rle.bmp diff --git a/examples/bmpsuite/g08s0.bmp b/test/bmpsuite/g08s0.bmp Binary files differindex 4b2c521..4b2c521 100644 --- a/examples/bmpsuite/g08s0.bmp +++ b/test/bmpsuite/g08s0.bmp diff --git a/examples/bmpsuite/g08w124.bmp b/test/bmpsuite/g08w124.bmp Binary files differindex 1896035..1896035 100644 --- a/examples/bmpsuite/g08w124.bmp +++ b/test/bmpsuite/g08w124.bmp diff --git a/examples/bmpsuite/g08w125.bmp b/test/bmpsuite/g08w125.bmp Binary files differindex b348a7c..b348a7c 100644 --- a/examples/bmpsuite/g08w125.bmp +++ b/test/bmpsuite/g08w125.bmp diff --git a/examples/bmpsuite/g08w126.bmp b/test/bmpsuite/g08w126.bmp Binary files differindex 3628d66..3628d66 100644 --- a/examples/bmpsuite/g08w126.bmp +++ b/test/bmpsuite/g08w126.bmp diff --git a/examples/bmpsuite/g16bf555.bmp b/test/bmpsuite/g16bf555.bmp Binary files differindex 639a57f..639a57f 100644 --- a/examples/bmpsuite/g16bf555.bmp +++ b/test/bmpsuite/g16bf555.bmp diff --git a/examples/bmpsuite/g16bf565.bmp b/test/bmpsuite/g16bf565.bmp Binary files differindex cb0ea24..cb0ea24 100644 --- a/examples/bmpsuite/g16bf565.bmp +++ b/test/bmpsuite/g16bf565.bmp diff --git a/examples/bmpsuite/g16def555.bmp b/test/bmpsuite/g16def555.bmp Binary files differindex a5a3195..a5a3195 100644 --- a/examples/bmpsuite/g16def555.bmp +++ b/test/bmpsuite/g16def555.bmp diff --git a/examples/bmpsuite/g24.bmp b/test/bmpsuite/g24.bmp Binary files differindex d6d9e6a..d6d9e6a 100644 --- a/examples/bmpsuite/g24.bmp +++ b/test/bmpsuite/g24.bmp diff --git a/examples/bmpsuite/g32bf.bmp b/test/bmpsuite/g32bf.bmp Binary files differindex 0f41534..0f41534 100644 --- a/examples/bmpsuite/g32bf.bmp +++ b/test/bmpsuite/g32bf.bmp diff --git a/examples/bmpsuite/g32def.bmp b/test/bmpsuite/g32def.bmp Binary files differindex 9524f76..9524f76 100644 --- a/examples/bmpsuite/g32def.bmp +++ b/test/bmpsuite/g32def.bmp diff --git a/examples/bmpsuite/png/01bg.png b/test/bmpsuite/png/01bg.png Binary files differindex 0b9cf9a..0b9cf9a 100644 --- a/examples/bmpsuite/png/01bg.png +++ b/test/bmpsuite/png/01bg.png diff --git a/examples/bmpsuite/png/01bw.png b/test/bmpsuite/png/01bw.png Binary files differindex 9f2e57a..9f2e57a 100644 --- a/examples/bmpsuite/png/01bw.png +++ b/test/bmpsuite/png/01bw.png diff --git a/examples/bmpsuite/png/01p1.png b/test/bmpsuite/png/01p1.png Binary files differindex 0103e79..0103e79 100644 --- a/examples/bmpsuite/png/01p1.png +++ b/test/bmpsuite/png/01p1.png diff --git a/examples/bmpsuite/png/04.png b/test/bmpsuite/png/04.png Binary files differindex 14beb91..14beb91 100644 --- a/examples/bmpsuite/png/04.png +++ b/test/bmpsuite/png/04.png diff --git a/examples/bmpsuite/png/04p4.png b/test/bmpsuite/png/04p4.png Binary files differindex 8dbcafa..8dbcafa 100644 --- a/examples/bmpsuite/png/04p4.png +++ b/test/bmpsuite/png/04p4.png diff --git a/examples/bmpsuite/png/08.png b/test/bmpsuite/png/08.png Binary files differindex 06545a0..06545a0 100644 --- a/examples/bmpsuite/png/08.png +++ b/test/bmpsuite/png/08.png diff --git a/examples/bmpsuite/png/08p64.png b/test/bmpsuite/png/08p64.png Binary files differindex 49f0802..49f0802 100644 --- a/examples/bmpsuite/png/08p64.png +++ b/test/bmpsuite/png/08p64.png diff --git a/examples/bmpsuite/png/08w124.png b/test/bmpsuite/png/08w124.png Binary files differindex 8da58fb..8da58fb 100644 --- a/examples/bmpsuite/png/08w124.png +++ b/test/bmpsuite/png/08w124.png diff --git a/examples/bmpsuite/png/08w125.png b/test/bmpsuite/png/08w125.png Binary files differindex 6ebb4f8..6ebb4f8 100644 --- a/examples/bmpsuite/png/08w125.png +++ b/test/bmpsuite/png/08w125.png diff --git a/examples/bmpsuite/png/08w126.png b/test/bmpsuite/png/08w126.png Binary files differindex ca9c9b9..ca9c9b9 100644 --- a/examples/bmpsuite/png/08w126.png +++ b/test/bmpsuite/png/08w126.png diff --git a/examples/bmpsuite/png/16bf555.png b/test/bmpsuite/png/16bf555.png Binary files differindex aaa0dff..aaa0dff 100644 --- a/examples/bmpsuite/png/16bf555.png +++ b/test/bmpsuite/png/16bf555.png diff --git a/examples/bmpsuite/png/16bf565.png b/test/bmpsuite/png/16bf565.png Binary files differindex 52d90e3..52d90e3 100644 --- a/examples/bmpsuite/png/16bf565.png +++ b/test/bmpsuite/png/16bf565.png diff --git a/examples/bmpsuite/png/24.png b/test/bmpsuite/png/24.png Binary files differindex e9fc4db..e9fc4db 100644 --- a/examples/bmpsuite/png/24.png +++ b/test/bmpsuite/png/24.png diff --git a/examples/bmpsuite/png/reference.html b/test/bmpsuite/png/reference.html index 7117b6c..7117b6c 100644 --- a/examples/bmpsuite/png/reference.html +++ b/test/bmpsuite/png/reference.html diff --git a/examples/bmpsuite/readme.txt b/test/bmpsuite/readme.txt index 347aded..347aded 100644 --- a/examples/bmpsuite/readme.txt +++ b/test/bmpsuite/readme.txt diff --git a/examples/bmpsuite/test.html b/test/bmpsuite/test.html index 8abb614..8abb614 100644 --- a/examples/bmpsuite/test.html +++ b/test/bmpsuite/test.html diff --git a/examples/decode_bmp.c b/test/decode_bmp.c index e5dc572..e5dc572 100644 --- a/examples/decode_bmp.c +++ b/test/decode_bmp.c diff --git a/examples/decode_ico.c b/test/decode_ico.c index 935001c..935001c 100644 --- a/examples/decode_ico.c +++ b/test/decode_ico.c diff --git a/examples/monitor.ico b/test/icons/monitor.ico Binary files differindex 2997dc3..2997dc3 100644 --- a/examples/monitor.ico +++ b/test/icons/monitor.ico diff --git a/test/runtest.sh b/test/runtest.sh new file mode 100755 index 0000000..65d7f45 --- /dev/null +++ b/test/runtest.sh @@ -0,0 +1,26 @@ +#!/bin/sh + +TEST_PATH=$1 +TEST_OUT=${TEST_PATH}/ppm + +mkdir -p ${TEST_OUT} + +bmpdecode() +{ + OUTF=$(basename ${1} .bmp) + ${TEST_PATH}/test_decode_bmp ${1} > ${TEST_OUT}/${OUTF}.ppm +} + +icodecode() +{ + OUTF=$(basename ${1} .ico) + ${TEST_PATH}/test_decode_ico ${1} > ${TEST_OUT}/${OUTF}.ppm +} + +for BMP in $(ls test/bmpsuite/*.bmp);do + bmpdecode ${BMP} +done + +#for ICO in $(ls test/icons/*.ico);do +# icodecode ${BMP} +#done |