From e1a7af6f290489812ed47359eaff0edac2f5df95 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Fri, 13 Jan 2012 16:14:48 -0500 Subject: FATE: fix targa tests on big-endian systems --- tests/fate/image.mak | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/fate/image.mak b/tests/fate/image.mak index 153a4f397e..7fdbdc4280 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -48,13 +48,13 @@ fate-targa: $(FATE_TARGA) fate-targa-conformance-CBW8: CMD = framecrc -i $(SAMPLES)/targa-conformance/CBW8.TGA # fate-targa-conformance-CCM8: CMD = framecrc -i $(SAMPLES)/targa-conformance/CCM8.TGA -fate-targa-conformance-CTC16: CMD = framecrc -i $(SAMPLES)/targa-conformance/CTC16.TGA +fate-targa-conformance-CTC16: CMD = framecrc -i $(SAMPLES)/targa-conformance/CTC16.TGA -pix_fmt rgb555le fate-targa-conformance-CTC24: CMD = framecrc -i $(SAMPLES)/targa-conformance/CTC24.TGA -fate-targa-conformance-CTC32: CMD = framecrc -i $(SAMPLES)/targa-conformance/CTC32.TGA +fate-targa-conformance-CTC32: CMD = framecrc -i $(SAMPLES)/targa-conformance/CTC32.TGA -pix_fmt bgra fate-targa-conformance-UBW8: CMD = framecrc -i $(SAMPLES)/targa-conformance/UBW8.TGA # fate-targa-conformance-UCM8: CMD = framecrc -i $(SAMPLES)/targa-conformance/UCM8.TGA -fate-targa-conformance-UTC16: CMD = framecrc -i $(SAMPLES)/targa-conformance/UTC16.TGA +fate-targa-conformance-UTC16: CMD = framecrc -i $(SAMPLES)/targa-conformance/UTC16.TGA -pix_fmt rgb555le fate-targa-conformance-UTC24: CMD = framecrc -i $(SAMPLES)/targa-conformance/UTC24.TGA -fate-targa-conformance-UTC32: CMD = framecrc -i $(SAMPLES)/targa-conformance/UTC32.TGA +fate-targa-conformance-UTC32: CMD = framecrc -i $(SAMPLES)/targa-conformance/UTC32.TGA -pix_fmt bgra fate-targa-top-to-bottom: CMD = framecrc -i $(SAMPLES)/targa/lena-top-to-bottom.tga -- cgit v1.2.3 From 9c2f9b0e2dd5bd570e571890bdfb6e77190c4c55 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Fri, 13 Jan 2012 16:41:15 -0500 Subject: FATE: enable the 2 remaining targa conformance suite tests --- tests/fate/image.mak | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/fate/image.mak b/tests/fate/image.mak index 7fdbdc4280..df0603f2ef 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -32,10 +32,12 @@ FATE_TESTS += fate-sunraster-24bit-rle fate-sunraster-24bit-rle: CMD = framecrc -i $(SAMPLES)/sunraster/lena-24bit-rle.sun FATE_TARGA = CBW8 \ + CCM8 \ CTC16 \ CTC24 \ CTC32 \ UBW8 \ + UCM8 \ UTC16 \ UTC24 \ UTC32 @@ -47,12 +49,12 @@ FATE_TESTS += $(FATE_TARGA) fate-targa: $(FATE_TARGA) fate-targa-conformance-CBW8: CMD = framecrc -i $(SAMPLES)/targa-conformance/CBW8.TGA -# fate-targa-conformance-CCM8: CMD = framecrc -i $(SAMPLES)/targa-conformance/CCM8.TGA +fate-targa-conformance-CCM8: CMD = framecrc -i $(SAMPLES)/targa-conformance/CCM8.TGA fate-targa-conformance-CTC16: CMD = framecrc -i $(SAMPLES)/targa-conformance/CTC16.TGA -pix_fmt rgb555le fate-targa-conformance-CTC24: CMD = framecrc -i $(SAMPLES)/targa-conformance/CTC24.TGA fate-targa-conformance-CTC32: CMD = framecrc -i $(SAMPLES)/targa-conformance/CTC32.TGA -pix_fmt bgra fate-targa-conformance-UBW8: CMD = framecrc -i $(SAMPLES)/targa-conformance/UBW8.TGA -# fate-targa-conformance-UCM8: CMD = framecrc -i $(SAMPLES)/targa-conformance/UCM8.TGA +fate-targa-conformance-UCM8: CMD = framecrc -i $(SAMPLES)/targa-conformance/UCM8.TGA fate-targa-conformance-UTC16: CMD = framecrc -i $(SAMPLES)/targa-conformance/UTC16.TGA -pix_fmt rgb555le fate-targa-conformance-UTC24: CMD = framecrc -i $(SAMPLES)/targa-conformance/UTC24.TGA fate-targa-conformance-UTC32: CMD = framecrc -i $(SAMPLES)/targa-conformance/UTC32.TGA -pix_fmt bgra -- cgit v1.2.3 From 502bf3b462e40ae64d088c3246ef48fa618e4572 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Fri, 13 Jan 2012 23:52:59 +0100 Subject: fate: add missing reference files for targa tests in 9c2f9b0e2 Fixes fate-targa-conformance-CCM8 and fate-targa-conformance-UCM8. --- tests/ref/fate/targa-conformance-CCM8 | 1 + tests/ref/fate/targa-conformance-UCM8 | 1 + 2 files changed, 2 insertions(+) create mode 100644 tests/ref/fate/targa-conformance-CCM8 create mode 100644 tests/ref/fate/targa-conformance-UCM8 (limited to 'tests') diff --git a/tests/ref/fate/targa-conformance-CCM8 b/tests/ref/fate/targa-conformance-CCM8 new file mode 100644 index 0000000000..3f6be24360 --- /dev/null +++ b/tests/ref/fate/targa-conformance-CCM8 @@ -0,0 +1 @@ +0, 0, 17408, 0x2bc2e306 diff --git a/tests/ref/fate/targa-conformance-UCM8 b/tests/ref/fate/targa-conformance-UCM8 new file mode 100644 index 0000000000..3f6be24360 --- /dev/null +++ b/tests/ref/fate/targa-conformance-UCM8 @@ -0,0 +1 @@ +0, 0, 17408, 0x2bc2e306 -- cgit v1.2.3 From 4c82c6d9932bfdb1a9eb288d566ded9d40ca5e24 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Fri, 13 Jan 2012 18:40:12 -0500 Subject: FATE: convert output to rgba for the targa tests which currently output pal8 fixes the tests on big-endian systems --- tests/fate/image.mak | 4 ++-- tests/ref/fate/targa-conformance-CCM8 | 2 +- tests/ref/fate/targa-conformance-UCM8 | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/fate/image.mak b/tests/fate/image.mak index df0603f2ef..9714cd8c5a 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -49,12 +49,12 @@ FATE_TESTS += $(FATE_TARGA) fate-targa: $(FATE_TARGA) fate-targa-conformance-CBW8: CMD = framecrc -i $(SAMPLES)/targa-conformance/CBW8.TGA -fate-targa-conformance-CCM8: CMD = framecrc -i $(SAMPLES)/targa-conformance/CCM8.TGA +fate-targa-conformance-CCM8: CMD = framecrc -i $(SAMPLES)/targa-conformance/CCM8.TGA -pix_fmt rgba fate-targa-conformance-CTC16: CMD = framecrc -i $(SAMPLES)/targa-conformance/CTC16.TGA -pix_fmt rgb555le fate-targa-conformance-CTC24: CMD = framecrc -i $(SAMPLES)/targa-conformance/CTC24.TGA fate-targa-conformance-CTC32: CMD = framecrc -i $(SAMPLES)/targa-conformance/CTC32.TGA -pix_fmt bgra fate-targa-conformance-UBW8: CMD = framecrc -i $(SAMPLES)/targa-conformance/UBW8.TGA -fate-targa-conformance-UCM8: CMD = framecrc -i $(SAMPLES)/targa-conformance/UCM8.TGA +fate-targa-conformance-UCM8: CMD = framecrc -i $(SAMPLES)/targa-conformance/UCM8.TGA -pix_fmt rgba fate-targa-conformance-UTC16: CMD = framecrc -i $(SAMPLES)/targa-conformance/UTC16.TGA -pix_fmt rgb555le fate-targa-conformance-UTC24: CMD = framecrc -i $(SAMPLES)/targa-conformance/UTC24.TGA fate-targa-conformance-UTC32: CMD = framecrc -i $(SAMPLES)/targa-conformance/UTC32.TGA -pix_fmt bgra diff --git a/tests/ref/fate/targa-conformance-CCM8 b/tests/ref/fate/targa-conformance-CCM8 index 3f6be24360..acc3068e26 100644 --- a/tests/ref/fate/targa-conformance-CCM8 +++ b/tests/ref/fate/targa-conformance-CCM8 @@ -1 +1 @@ -0, 0, 17408, 0x2bc2e306 +0, 0, 65536, 0xcf98bc29 diff --git a/tests/ref/fate/targa-conformance-UCM8 b/tests/ref/fate/targa-conformance-UCM8 index 3f6be24360..acc3068e26 100644 --- a/tests/ref/fate/targa-conformance-UCM8 +++ b/tests/ref/fate/targa-conformance-UCM8 @@ -1 +1 @@ -0, 0, 17408, 0x2bc2e306 +0, 0, 65536, 0xcf98bc29 -- cgit v1.2.3