diff --git a/tests/compile_tests/image/icons/1bpp.ico b/tests/compile_tests/image/1bpp.ico similarity index 100% rename from tests/compile_tests/image/icons/1bpp.ico rename to tests/compile_tests/image/1bpp.ico diff --git a/tests/compile_tests/image/icons/1bpp.ico.bmp b/tests/compile_tests/image/1bpp.ico.bmp similarity index 100% rename from tests/compile_tests/image/icons/1bpp.ico.bmp rename to tests/compile_tests/image/1bpp.ico.bmp diff --git a/tests/compile_tests/image/icons/24bpp.ico b/tests/compile_tests/image/24bpp.ico similarity index 100% rename from tests/compile_tests/image/icons/24bpp.ico rename to tests/compile_tests/image/24bpp.ico diff --git a/tests/compile_tests/image/icons/24bpp.ico.bmp b/tests/compile_tests/image/24bpp.ico.bmp similarity index 100% rename from tests/compile_tests/image/icons/24bpp.ico.bmp rename to tests/compile_tests/image/24bpp.ico.bmp diff --git a/tests/compile_tests/image/icons/4bpp.cur b/tests/compile_tests/image/4bpp.cur similarity index 100% rename from tests/compile_tests/image/icons/4bpp.cur rename to tests/compile_tests/image/4bpp.cur diff --git a/tests/compile_tests/image/icons/4bpp.cur.bmp b/tests/compile_tests/image/4bpp.cur.bmp similarity index 100% rename from tests/compile_tests/image/icons/4bpp.cur.bmp rename to tests/compile_tests/image/4bpp.cur.bmp diff --git a/tests/compile_tests/image/icons/4bpp.ico b/tests/compile_tests/image/4bpp.ico similarity index 100% rename from tests/compile_tests/image/icons/4bpp.ico rename to tests/compile_tests/image/4bpp.ico diff --git a/tests/compile_tests/image/icons/4bpp.ico.bmp b/tests/compile_tests/image/4bpp.ico.bmp similarity index 100% rename from tests/compile_tests/image/icons/4bpp.ico.bmp rename to tests/compile_tests/image/4bpp.ico.bmp diff --git a/tests/compile_tests/image/icons/8bpp.cur b/tests/compile_tests/image/8bpp.cur similarity index 100% rename from tests/compile_tests/image/icons/8bpp.cur rename to tests/compile_tests/image/8bpp.cur diff --git a/tests/compile_tests/image/icons/8bpp.cur.bmp b/tests/compile_tests/image/8bpp.cur.bmp similarity index 100% rename from tests/compile_tests/image/icons/8bpp.cur.bmp rename to tests/compile_tests/image/8bpp.cur.bmp diff --git a/tests/compile_tests/image/icons/8bpp.ico b/tests/compile_tests/image/8bpp.ico similarity index 100% rename from tests/compile_tests/image/icons/8bpp.ico rename to tests/compile_tests/image/8bpp.ico diff --git a/tests/compile_tests/image/icons/8bpp.ico.bmp b/tests/compile_tests/image/8bpp.ico.bmp similarity index 100% rename from tests/compile_tests/image/icons/8bpp.ico.bmp rename to tests/compile_tests/image/8bpp.ico.bmp diff --git a/tests/compile_tests/image/icons/bard.ico b/tests/compile_tests/image/bard.ico similarity index 100% rename from tests/compile_tests/image/icons/bard.ico rename to tests/compile_tests/image/bard.ico diff --git a/tests/compile_tests/image/icons/bard.ico.bmp b/tests/compile_tests/image/bard.ico.bmp similarity index 100% rename from tests/compile_tests/image/icons/bard.ico.bmp rename to tests/compile_tests/image/bard.ico.bmp diff --git a/tests/compile_tests/image/icons/broom.ico b/tests/compile_tests/image/broom.ico similarity index 100% rename from tests/compile_tests/image/icons/broom.ico rename to tests/compile_tests/image/broom.ico diff --git a/tests/compile_tests/image/icons/broom.ico.bmp b/tests/compile_tests/image/broom.ico.bmp similarity index 100% rename from tests/compile_tests/image/icons/broom.ico.bmp rename to tests/compile_tests/image/broom.ico.bmp diff --git a/tests/compile_tests/image/icons/cat.ico b/tests/compile_tests/image/cat.ico similarity index 100% rename from tests/compile_tests/image/icons/cat.ico rename to tests/compile_tests/image/cat.ico diff --git a/tests/compile_tests/image/icons/cat.ico.bmp b/tests/compile_tests/image/cat.ico.bmp similarity index 100% rename from tests/compile_tests/image/icons/cat.ico.bmp rename to tests/compile_tests/image/cat.ico.bmp diff --git a/tests/compile_tests/image/icons/computer.ico b/tests/compile_tests/image/computer.ico similarity index 100% rename from tests/compile_tests/image/icons/computer.ico rename to tests/compile_tests/image/computer.ico diff --git a/tests/compile_tests/image/icons/computer.ico.bmp b/tests/compile_tests/image/computer.ico.bmp similarity index 100% rename from tests/compile_tests/image/icons/computer.ico.bmp rename to tests/compile_tests/image/computer.ico.bmp diff --git a/tests/compile_tests/image/curico_test.bas b/tests/compile_tests/image/curico_test.bas index 6afe88696..89ae4300d 100644 --- a/tests/compile_tests/image/curico_test.bas +++ b/tests/compile_tests/image/curico_test.bas @@ -3,7 +3,6 @@ OPTION _EXPLICIT $CONSOLE:ONLY CHDIR _STARTDIR$ -CONST ICON_DIR = "./icons/" CONST TEST_FILE_FORMAT = "bmp" CONST TOLERANCE_LIMIT = 0 @@ -14,14 +13,24 @@ RESTORE file_list DIM fileName AS STRING: READ fileName DO - DoImageFile ICON_DIR + fileName + DoImageFile fileName READ fileName LOOP WHILE LEN(fileName) SYSTEM error_handler: -PRINT "Error: "; _ERRORMESSAGE$; " at line line"; _ERRORLINE +PRINT "Error: "; _ERRORMESSAGE$; " at line"; _ERRORLINE; + +DIM incErrFile AS STRING: incErrFile = _INCLERRORFILE$ +DIM incErrLine AS LONG: incErrLine = _INCLERRORLINE + +IF LEN(incErrFile) THEN + PRINT "( "; incErrFile + " at line"; incErrLine; ")" +ELSE + PRINT +END IF + SYSTEM file_list: diff --git a/tests/compile_tests/image/curico_test.output b/tests/compile_tests/image/curico_test.output index eb5c9618f..ecfbc50b4 100644 --- a/tests/compile_tests/image/curico_test.output +++ b/tests/compile_tests/image/curico_test.output @@ -1,100 +1,100 @@ -Loading image from storage ./icons/1bpp.ico ... done. -Testing against ./icons/1bpp.ico.bmp ( 128 x 128 ). +Loading image from storage 1bpp.ico ... done. +Testing against 1bpp.ico.bmp ( 128 x 128 ). Success, images are identical! -Loading image from storage ./icons/24bpp.ico ... done. -Testing against ./icons/24bpp.ico.bmp ( 128 x 128 ). +Loading image from storage 24bpp.ico ... done. +Testing against 24bpp.ico.bmp ( 128 x 128 ). Success, images are identical! -Loading image from storage ./icons/4bpp.cur ... done. -Testing against ./icons/4bpp.cur.bmp ( 16 x 16 ). +Loading image from storage 4bpp.cur ... done. +Testing against 4bpp.cur.bmp ( 16 x 16 ). Success, images are identical! -Loading image from storage ./icons/4bpp.ico ... done. -Testing against ./icons/4bpp.ico.bmp ( 128 x 128 ). +Loading image from storage 4bpp.ico ... done. +Testing against 4bpp.ico.bmp ( 128 x 128 ). Success, images are identical! -Loading image from storage ./icons/8bpp.ico ... done. -Testing against ./icons/8bpp.ico.bmp ( 128 x 128 ). +Loading image from storage 8bpp.ico ... done. +Testing against 8bpp.ico.bmp ( 128 x 128 ). Success, images are identical! -Loading image from storage ./icons/8bpp.cur ... done. -Testing against ./icons/8bpp.cur.bmp ( 32 x 32 ). +Loading image from storage 8bpp.cur ... done. +Testing against 8bpp.cur.bmp ( 32 x 32 ). Success, images are identical! -Loading image from storage ./icons/bard.ico ... done. -Testing against ./icons/bard.ico.bmp ( 1360 x 1083 ). +Loading image from storage bard.ico ... done. +Testing against bard.ico.bmp ( 1360 x 1083 ). Success, images are identical! -Loading image from storage ./icons/broom.ico ... done. -Testing against ./icons/broom.ico.bmp ( 600 x 600 ). +Loading image from storage broom.ico ... done. +Testing against broom.ico.bmp ( 600 x 600 ). Success, images are identical! -Loading image from storage ./icons/cat.ico ... done. -Testing against ./icons/cat.ico.bmp ( 150 x 150 ). +Loading image from storage cat.ico ... done. +Testing against cat.ico.bmp ( 150 x 150 ). Success, images are identical! -Loading image from storage ./icons/computer.ico ... done. -Testing against ./icons/computer.ico.bmp ( 474 x 474 ). +Loading image from storage computer.ico ... done. +Testing against computer.ico.bmp ( 474 x 474 ). Success, images are identical! -Loading image from storage ./icons/dumb1.ico ... done. -Testing against ./icons/dumb1.ico.bmp ( 540 x 500 ). +Loading image from storage dumb1.ico ... done. +Testing against dumb1.ico.bmp ( 540 x 500 ). Success, images are identical! -Loading image from storage ./icons/dumb2.ico ... done. -Testing against ./icons/dumb2.ico.bmp ( 540 x 500 ). +Loading image from storage dumb2.ico ... done. +Testing against dumb2.ico.bmp ( 540 x 500 ). Success, images are identical! -Loading image from storage ./icons/pencil.ico ... done. -Testing against ./icons/pencil.ico.bmp ( 256 x 256 ). +Loading image from storage pencil.ico ... done. +Testing against pencil.ico.bmp ( 256 x 256 ). Success, images are identical! -Loading image from storage ./icons/please_wait.ico ... done. -Testing against ./icons/please_wait.ico.bmp ( 404 x 325 ). +Loading image from storage please_wait.ico ... done. +Testing against please_wait.ico.bmp ( 404 x 325 ). Success, images are identical! -Loading image from storage ./icons/question.ico ... done. -Testing against ./icons/question.ico.bmp ( 512 x 512 ). +Loading image from storage question.ico ... done. +Testing against question.ico.bmp ( 512 x 512 ). Success, images are identical! -Loading image from storage ./icons/really_huge_duck.ico ... done. -Testing against ./icons/really_huge_duck.ico.bmp ( 4293 x 4293 ). +Loading image from storage really_huge_duck.ico ... done. +Testing against really_huge_duck.ico.bmp ( 4293 x 4293 ). Success, images are identical! -Loading image from storage ./icons/sample3.ico ... done. -Testing against ./icons/sample3.ico.bmp ( 256 x 171 ). +Loading image from storage sample3.ico ... done. +Testing against sample3.ico.bmp ( 256 x 171 ). Success, images are identical! -Loading image from storage ./icons/sample4.ico ... done. -Testing against ./icons/sample4.ico.bmp ( 256 x 192 ). +Loading image from storage sample4.ico ... done. +Testing against sample4.ico.bmp ( 256 x 192 ). Success, images are identical! -Loading image from storage ./icons/soft_drink.ico ... done. -Testing against ./icons/soft_drink.ico.bmp ( 256 x 256 ). +Loading image from storage soft_drink.ico ... done. +Testing against soft_drink.ico.bmp ( 256 x 256 ). Success, images are identical! -Loading image from storage ./icons/taco.ico ... done. -Testing against ./icons/taco.ico.bmp ( 966 x 764 ). +Loading image from storage taco.ico ... done. +Testing against taco.ico.bmp ( 966 x 764 ). Success, images are identical! -Loading image from storage ./icons/terra_globe.ico ... done. -Testing against ./icons/terra_globe.ico.bmp ( 772 x 769 ). +Loading image from storage terra_globe.ico ... done. +Testing against terra_globe.ico.bmp ( 772 x 769 ). Success, images are identical! -Loading image from storage ./icons/thumbs_up.ico ... done. -Testing against ./icons/thumbs_up.ico.bmp ( 463 x 294 ). +Loading image from storage thumbs_up.ico ... done. +Testing against thumbs_up.ico.bmp ( 463 x 294 ). Success, images are identical! -Loading image from storage ./icons/volme_dialog.ico ... done. -Testing against ./icons/volme_dialog.ico.bmp ( 32 x 32 ). +Loading image from storage volme_dialog.ico ... done. +Testing against volme_dialog.ico.bmp ( 32 x 32 ). Success, images are identical! -Loading image from storage ./icons/word-icon.ico ... done. -Testing against ./icons/word-icon.ico.bmp ( 512 x 512 ). +Loading image from storage word-icon.ico ... done. +Testing against word-icon.ico.bmp ( 512 x 512 ). Success, images are identical! -Loading image from storage ./icons/x.ico ... done. -Testing against ./icons/x.ico.bmp ( 256 x 256 ). +Loading image from storage x.ico ... done. +Testing against x.ico.bmp ( 256 x 256 ). Success, images are identical! diff --git a/tests/compile_tests/image/icons/dumb1.ico b/tests/compile_tests/image/dumb1.ico similarity index 100% rename from tests/compile_tests/image/icons/dumb1.ico rename to tests/compile_tests/image/dumb1.ico diff --git a/tests/compile_tests/image/icons/dumb1.ico.bmp b/tests/compile_tests/image/dumb1.ico.bmp similarity index 100% rename from tests/compile_tests/image/icons/dumb1.ico.bmp rename to tests/compile_tests/image/dumb1.ico.bmp diff --git a/tests/compile_tests/image/icons/dumb2.ico b/tests/compile_tests/image/dumb2.ico similarity index 100% rename from tests/compile_tests/image/icons/dumb2.ico rename to tests/compile_tests/image/dumb2.ico diff --git a/tests/compile_tests/image/icons/dumb2.ico.bmp b/tests/compile_tests/image/dumb2.ico.bmp similarity index 100% rename from tests/compile_tests/image/icons/dumb2.ico.bmp rename to tests/compile_tests/image/dumb2.ico.bmp diff --git a/tests/compile_tests/image/icons/pencil.ico b/tests/compile_tests/image/pencil.ico similarity index 100% rename from tests/compile_tests/image/icons/pencil.ico rename to tests/compile_tests/image/pencil.ico diff --git a/tests/compile_tests/image/icons/pencil.ico.bmp b/tests/compile_tests/image/pencil.ico.bmp similarity index 100% rename from tests/compile_tests/image/icons/pencil.ico.bmp rename to tests/compile_tests/image/pencil.ico.bmp diff --git a/tests/compile_tests/image/icons/please_wait.ico b/tests/compile_tests/image/please_wait.ico similarity index 100% rename from tests/compile_tests/image/icons/please_wait.ico rename to tests/compile_tests/image/please_wait.ico diff --git a/tests/compile_tests/image/icons/please_wait.ico.bmp b/tests/compile_tests/image/please_wait.ico.bmp similarity index 100% rename from tests/compile_tests/image/icons/please_wait.ico.bmp rename to tests/compile_tests/image/please_wait.ico.bmp diff --git a/tests/compile_tests/image/icons/question.ico b/tests/compile_tests/image/question.ico similarity index 100% rename from tests/compile_tests/image/icons/question.ico rename to tests/compile_tests/image/question.ico diff --git a/tests/compile_tests/image/icons/question.ico.bmp b/tests/compile_tests/image/question.ico.bmp similarity index 100% rename from tests/compile_tests/image/icons/question.ico.bmp rename to tests/compile_tests/image/question.ico.bmp diff --git a/tests/compile_tests/image/icons/really_huge_duck.ico b/tests/compile_tests/image/really_huge_duck.ico similarity index 100% rename from tests/compile_tests/image/icons/really_huge_duck.ico rename to tests/compile_tests/image/really_huge_duck.ico diff --git a/tests/compile_tests/image/icons/really_huge_duck.ico.bmp b/tests/compile_tests/image/really_huge_duck.ico.bmp similarity index 100% rename from tests/compile_tests/image/icons/really_huge_duck.ico.bmp rename to tests/compile_tests/image/really_huge_duck.ico.bmp diff --git a/tests/compile_tests/image/icons/sample3.ico b/tests/compile_tests/image/sample3.ico similarity index 100% rename from tests/compile_tests/image/icons/sample3.ico rename to tests/compile_tests/image/sample3.ico diff --git a/tests/compile_tests/image/icons/sample3.ico.bmp b/tests/compile_tests/image/sample3.ico.bmp similarity index 100% rename from tests/compile_tests/image/icons/sample3.ico.bmp rename to tests/compile_tests/image/sample3.ico.bmp diff --git a/tests/compile_tests/image/icons/sample4.ico b/tests/compile_tests/image/sample4.ico similarity index 100% rename from tests/compile_tests/image/icons/sample4.ico rename to tests/compile_tests/image/sample4.ico diff --git a/tests/compile_tests/image/icons/sample4.ico.bmp b/tests/compile_tests/image/sample4.ico.bmp similarity index 100% rename from tests/compile_tests/image/icons/sample4.ico.bmp rename to tests/compile_tests/image/sample4.ico.bmp diff --git a/tests/compile_tests/image/icons/soft_drink.ico b/tests/compile_tests/image/soft_drink.ico similarity index 100% rename from tests/compile_tests/image/icons/soft_drink.ico rename to tests/compile_tests/image/soft_drink.ico diff --git a/tests/compile_tests/image/icons/soft_drink.ico.bmp b/tests/compile_tests/image/soft_drink.ico.bmp similarity index 100% rename from tests/compile_tests/image/icons/soft_drink.ico.bmp rename to tests/compile_tests/image/soft_drink.ico.bmp diff --git a/tests/compile_tests/image/icons/taco.ico b/tests/compile_tests/image/taco.ico similarity index 100% rename from tests/compile_tests/image/icons/taco.ico rename to tests/compile_tests/image/taco.ico diff --git a/tests/compile_tests/image/icons/taco.ico.bmp b/tests/compile_tests/image/taco.ico.bmp similarity index 100% rename from tests/compile_tests/image/icons/taco.ico.bmp rename to tests/compile_tests/image/taco.ico.bmp diff --git a/tests/compile_tests/image/icons/terra_globe.ico b/tests/compile_tests/image/terra_globe.ico similarity index 100% rename from tests/compile_tests/image/icons/terra_globe.ico rename to tests/compile_tests/image/terra_globe.ico diff --git a/tests/compile_tests/image/icons/terra_globe.ico.bmp b/tests/compile_tests/image/terra_globe.ico.bmp similarity index 100% rename from tests/compile_tests/image/icons/terra_globe.ico.bmp rename to tests/compile_tests/image/terra_globe.ico.bmp diff --git a/tests/compile_tests/image/icons/thumbs_up.ico b/tests/compile_tests/image/thumbs_up.ico similarity index 100% rename from tests/compile_tests/image/icons/thumbs_up.ico rename to tests/compile_tests/image/thumbs_up.ico diff --git a/tests/compile_tests/image/icons/thumbs_up.ico.bmp b/tests/compile_tests/image/thumbs_up.ico.bmp similarity index 100% rename from tests/compile_tests/image/icons/thumbs_up.ico.bmp rename to tests/compile_tests/image/thumbs_up.ico.bmp diff --git a/tests/compile_tests/image/icons/volme_dialog.ico b/tests/compile_tests/image/volme_dialog.ico similarity index 100% rename from tests/compile_tests/image/icons/volme_dialog.ico rename to tests/compile_tests/image/volme_dialog.ico diff --git a/tests/compile_tests/image/icons/volme_dialog.ico.bmp b/tests/compile_tests/image/volme_dialog.ico.bmp similarity index 100% rename from tests/compile_tests/image/icons/volme_dialog.ico.bmp rename to tests/compile_tests/image/volme_dialog.ico.bmp diff --git a/tests/compile_tests/image/icons/word-icon.ico b/tests/compile_tests/image/word-icon.ico similarity index 100% rename from tests/compile_tests/image/icons/word-icon.ico rename to tests/compile_tests/image/word-icon.ico diff --git a/tests/compile_tests/image/icons/word-icon.ico.bmp b/tests/compile_tests/image/word-icon.ico.bmp similarity index 100% rename from tests/compile_tests/image/icons/word-icon.ico.bmp rename to tests/compile_tests/image/word-icon.ico.bmp diff --git a/tests/compile_tests/image/icons/x.ico b/tests/compile_tests/image/x.ico similarity index 100% rename from tests/compile_tests/image/icons/x.ico rename to tests/compile_tests/image/x.ico diff --git a/tests/compile_tests/image/icons/x.ico.bmp b/tests/compile_tests/image/x.ico.bmp similarity index 100% rename from tests/compile_tests/image/icons/x.ico.bmp rename to tests/compile_tests/image/x.ico.bmp