From d208c8cdc71342dfe289cef92edba2bc6b3da600 Mon Sep 17 00:00:00 2001 From: Pyry Haulos Date: Tue, 30 Sep 2014 12:22:49 -0700 Subject: [PATCH] Add internal (dE-IT) module to CTS builds. Internal module has tests that validate build and base OS integration. Having those test available in the APKs makes it easier to rule out test framework issues if necessary. Change-Id: I56f4ce8834e60f94c1c4b0ded78750d2a7ebba3e --- Android.mk | 11 ++++++++++- .../internal/data/imagecompare/2_units_2d_cmp.png | Bin .../internal/data/imagecompare/2_units_2d_ref.png | Bin .../internal/data/imagecompare/4_units_cube_cmp.png | Bin .../internal/data/imagecompare/4_units_cube_ref.png | Bin {modules => data}/internal/data/imagecompare/cube_2_cmp.png | Bin {modules => data}/internal/data/imagecompare/cube_2_ref.png | Bin {modules => data}/internal/data/imagecompare/cube_cmp.png | Bin .../internal/data/imagecompare/cube_nmap_2_cmp.png | Bin .../internal/data/imagecompare/cube_nmap_2_ref.png | Bin .../internal/data/imagecompare/cube_nmap_cmp.png | Bin .../internal/data/imagecompare/cube_nmap_ref.png | Bin {modules => data}/internal/data/imagecompare/cube_ref.png | Bin .../internal/data/imagecompare/cube_sphere_2_cmp.png | Bin .../internal/data/imagecompare/cube_sphere_2_ref.png | Bin .../internal/data/imagecompare/cube_sphere_cmp.png | Bin .../internal/data/imagecompare/cube_sphere_ref.png | Bin .../internal/data/imagecompare/earth_diffuse_cmp.png | Bin .../internal/data/imagecompare/earth_diffuse_ref.png | Bin .../internal/data/imagecompare/earth_light_cmp.png | Bin .../internal/data/imagecompare/earth_light_ref.png | Bin .../internal/data/imagecompare/earth_spot_cmp.png | Bin .../internal/data/imagecompare/earth_spot_ref.png | Bin .../internal/data/imagecompare/earth_texture_cmp.png | Bin .../internal/data/imagecompare/earth_texture_ref.png | Bin .../internal/data/imagecompare/empty_256x256.png | Bin .../internal/data/imagecompare/lessThan0-reference.png | Bin .../internal/data/imagecompare/lessThan0-result.png | Bin .../internal/data/imagecompare/lessthan_vtx_cmp.png | Bin .../internal/data/imagecompare/lessthan_vtx_ref.png | Bin .../internal/data/imagecompare/readpixels_msaa.png | Bin .../internal/data/imagecompare/readpixels_ref.png | Bin .../internal/data/imagecompare/refract_frag_cmp.png | Bin .../internal/data/imagecompare/refract_frag_ref.png | Bin .../internal/data/imagecompare/refract_vtx_cmp.png | Bin .../internal/data/imagecompare/refract_vtx_ref.png | Bin .../internal/data/imagecompare/texfilter_cmp.png | Bin .../internal/data/imagecompare/texfilter_ref.png | Bin .../internal/data/imagecompare/texfilter_vtx_linear_cmp.png | Bin .../internal/data/imagecompare/texfilter_vtx_linear_ref.png | Bin .../data/imagecompare/texfilter_vtx_nearest_cmp.png | Bin .../data/imagecompare/texfilter_vtx_nearest_ref.png | Bin .../internal/data/imagecompare/white_256x256.png | Bin {modules => data}/internal/data/imageio/rgb24_209x181.png | Bin {modules => data}/internal/data/imageio/rgb24_256x256.png | Bin {modules => data}/internal/data/imageio/rgba32_207x219.png | Bin {modules => data}/internal/data/imageio/rgba32_256x256.png | Bin modules/internal/CMakeLists.txt | 2 +- 48 files changed, 11 insertions(+), 2 deletions(-) rename {modules => data}/internal/data/imagecompare/2_units_2d_cmp.png (100%) rename {modules => data}/internal/data/imagecompare/2_units_2d_ref.png (100%) rename {modules => data}/internal/data/imagecompare/4_units_cube_cmp.png (100%) rename {modules => data}/internal/data/imagecompare/4_units_cube_ref.png (100%) rename {modules => data}/internal/data/imagecompare/cube_2_cmp.png (100%) rename {modules => data}/internal/data/imagecompare/cube_2_ref.png (100%) rename {modules => data}/internal/data/imagecompare/cube_cmp.png (100%) rename {modules => data}/internal/data/imagecompare/cube_nmap_2_cmp.png (100%) rename {modules => data}/internal/data/imagecompare/cube_nmap_2_ref.png (100%) rename {modules => data}/internal/data/imagecompare/cube_nmap_cmp.png (100%) rename {modules => data}/internal/data/imagecompare/cube_nmap_ref.png (100%) rename {modules => data}/internal/data/imagecompare/cube_ref.png (100%) rename {modules => data}/internal/data/imagecompare/cube_sphere_2_cmp.png (100%) rename {modules => data}/internal/data/imagecompare/cube_sphere_2_ref.png (100%) rename {modules => data}/internal/data/imagecompare/cube_sphere_cmp.png (100%) rename {modules => data}/internal/data/imagecompare/cube_sphere_ref.png (100%) rename {modules => data}/internal/data/imagecompare/earth_diffuse_cmp.png (100%) rename {modules => data}/internal/data/imagecompare/earth_diffuse_ref.png (100%) rename {modules => data}/internal/data/imagecompare/earth_light_cmp.png (100%) rename {modules => data}/internal/data/imagecompare/earth_light_ref.png (100%) rename {modules => data}/internal/data/imagecompare/earth_spot_cmp.png (100%) rename {modules => data}/internal/data/imagecompare/earth_spot_ref.png (100%) rename {modules => data}/internal/data/imagecompare/earth_texture_cmp.png (100%) rename {modules => data}/internal/data/imagecompare/earth_texture_ref.png (100%) rename {modules => data}/internal/data/imagecompare/empty_256x256.png (100%) rename {modules => data}/internal/data/imagecompare/lessThan0-reference.png (100%) rename {modules => data}/internal/data/imagecompare/lessThan0-result.png (100%) rename {modules => data}/internal/data/imagecompare/lessthan_vtx_cmp.png (100%) rename {modules => data}/internal/data/imagecompare/lessthan_vtx_ref.png (100%) rename {modules => data}/internal/data/imagecompare/readpixels_msaa.png (100%) rename {modules => data}/internal/data/imagecompare/readpixels_ref.png (100%) rename {modules => data}/internal/data/imagecompare/refract_frag_cmp.png (100%) rename {modules => data}/internal/data/imagecompare/refract_frag_ref.png (100%) rename {modules => data}/internal/data/imagecompare/refract_vtx_cmp.png (100%) rename {modules => data}/internal/data/imagecompare/refract_vtx_ref.png (100%) rename {modules => data}/internal/data/imagecompare/texfilter_cmp.png (100%) rename {modules => data}/internal/data/imagecompare/texfilter_ref.png (100%) rename {modules => data}/internal/data/imagecompare/texfilter_vtx_linear_cmp.png (100%) rename {modules => data}/internal/data/imagecompare/texfilter_vtx_linear_ref.png (100%) rename {modules => data}/internal/data/imagecompare/texfilter_vtx_nearest_cmp.png (100%) rename {modules => data}/internal/data/imagecompare/texfilter_vtx_nearest_ref.png (100%) rename {modules => data}/internal/data/imagecompare/white_256x256.png (100%) rename {modules => data}/internal/data/imageio/rgb24_209x181.png (100%) rename {modules => data}/internal/data/imageio/rgb24_256x256.png (100%) rename {modules => data}/internal/data/imageio/rgba32_207x219.png (100%) rename {modules => data}/internal/data/imageio/rgba32_256x256.png (100%) diff --git a/Android.mk b/Android.mk index 850eb2c..28a33c2 100644 --- a/Android.mk +++ b/Android.mk @@ -473,7 +473,16 @@ LOCAL_SRC_FILES := \ modules/glshared/glsTextureBufferCase.cpp \ modules/glshared/glsTextureTestUtil.cpp \ modules/glshared/glsUniformBlockCase.cpp \ - modules/glshared/glsVertexArrayTests.cpp + modules/glshared/glsVertexArrayTests.cpp \ + modules/internal/ditBuildInfoTests.cpp \ + modules/internal/ditDelibsTests.cpp \ + modules/internal/ditFrameworkTests.cpp \ + modules/internal/ditImageCompareTests.cpp \ + modules/internal/ditImageIOTests.cpp \ + modules/internal/ditTestCase.cpp \ + modules/internal/ditTestLogTests.cpp \ + modules/internal/ditTestPackage.cpp \ + modules/internal/ditTestPackageEntry.cpp LOCAL_C_INCLUDES := \ frameworks/native/opengl/include \ diff --git a/modules/internal/data/imagecompare/2_units_2d_cmp.png b/data/internal/data/imagecompare/2_units_2d_cmp.png similarity index 100% rename from modules/internal/data/imagecompare/2_units_2d_cmp.png rename to data/internal/data/imagecompare/2_units_2d_cmp.png diff --git a/modules/internal/data/imagecompare/2_units_2d_ref.png b/data/internal/data/imagecompare/2_units_2d_ref.png similarity index 100% rename from modules/internal/data/imagecompare/2_units_2d_ref.png rename to data/internal/data/imagecompare/2_units_2d_ref.png diff --git a/modules/internal/data/imagecompare/4_units_cube_cmp.png b/data/internal/data/imagecompare/4_units_cube_cmp.png similarity index 100% rename from modules/internal/data/imagecompare/4_units_cube_cmp.png rename to data/internal/data/imagecompare/4_units_cube_cmp.png diff --git a/modules/internal/data/imagecompare/4_units_cube_ref.png b/data/internal/data/imagecompare/4_units_cube_ref.png similarity index 100% rename from modules/internal/data/imagecompare/4_units_cube_ref.png rename to data/internal/data/imagecompare/4_units_cube_ref.png diff --git a/modules/internal/data/imagecompare/cube_2_cmp.png b/data/internal/data/imagecompare/cube_2_cmp.png similarity index 100% rename from modules/internal/data/imagecompare/cube_2_cmp.png rename to data/internal/data/imagecompare/cube_2_cmp.png diff --git a/modules/internal/data/imagecompare/cube_2_ref.png b/data/internal/data/imagecompare/cube_2_ref.png similarity index 100% rename from modules/internal/data/imagecompare/cube_2_ref.png rename to data/internal/data/imagecompare/cube_2_ref.png diff --git a/modules/internal/data/imagecompare/cube_cmp.png b/data/internal/data/imagecompare/cube_cmp.png similarity index 100% rename from modules/internal/data/imagecompare/cube_cmp.png rename to data/internal/data/imagecompare/cube_cmp.png diff --git a/modules/internal/data/imagecompare/cube_nmap_2_cmp.png b/data/internal/data/imagecompare/cube_nmap_2_cmp.png similarity index 100% rename from modules/internal/data/imagecompare/cube_nmap_2_cmp.png rename to data/internal/data/imagecompare/cube_nmap_2_cmp.png diff --git a/modules/internal/data/imagecompare/cube_nmap_2_ref.png b/data/internal/data/imagecompare/cube_nmap_2_ref.png similarity index 100% rename from modules/internal/data/imagecompare/cube_nmap_2_ref.png rename to data/internal/data/imagecompare/cube_nmap_2_ref.png diff --git a/modules/internal/data/imagecompare/cube_nmap_cmp.png b/data/internal/data/imagecompare/cube_nmap_cmp.png similarity index 100% rename from modules/internal/data/imagecompare/cube_nmap_cmp.png rename to data/internal/data/imagecompare/cube_nmap_cmp.png diff --git a/modules/internal/data/imagecompare/cube_nmap_ref.png b/data/internal/data/imagecompare/cube_nmap_ref.png similarity index 100% rename from modules/internal/data/imagecompare/cube_nmap_ref.png rename to data/internal/data/imagecompare/cube_nmap_ref.png diff --git a/modules/internal/data/imagecompare/cube_ref.png b/data/internal/data/imagecompare/cube_ref.png similarity index 100% rename from modules/internal/data/imagecompare/cube_ref.png rename to data/internal/data/imagecompare/cube_ref.png diff --git a/modules/internal/data/imagecompare/cube_sphere_2_cmp.png b/data/internal/data/imagecompare/cube_sphere_2_cmp.png similarity index 100% rename from modules/internal/data/imagecompare/cube_sphere_2_cmp.png rename to data/internal/data/imagecompare/cube_sphere_2_cmp.png diff --git a/modules/internal/data/imagecompare/cube_sphere_2_ref.png b/data/internal/data/imagecompare/cube_sphere_2_ref.png similarity index 100% rename from modules/internal/data/imagecompare/cube_sphere_2_ref.png rename to data/internal/data/imagecompare/cube_sphere_2_ref.png diff --git a/modules/internal/data/imagecompare/cube_sphere_cmp.png b/data/internal/data/imagecompare/cube_sphere_cmp.png similarity index 100% rename from modules/internal/data/imagecompare/cube_sphere_cmp.png rename to data/internal/data/imagecompare/cube_sphere_cmp.png diff --git a/modules/internal/data/imagecompare/cube_sphere_ref.png b/data/internal/data/imagecompare/cube_sphere_ref.png similarity index 100% rename from modules/internal/data/imagecompare/cube_sphere_ref.png rename to data/internal/data/imagecompare/cube_sphere_ref.png diff --git a/modules/internal/data/imagecompare/earth_diffuse_cmp.png b/data/internal/data/imagecompare/earth_diffuse_cmp.png similarity index 100% rename from modules/internal/data/imagecompare/earth_diffuse_cmp.png rename to data/internal/data/imagecompare/earth_diffuse_cmp.png diff --git a/modules/internal/data/imagecompare/earth_diffuse_ref.png b/data/internal/data/imagecompare/earth_diffuse_ref.png similarity index 100% rename from modules/internal/data/imagecompare/earth_diffuse_ref.png rename to data/internal/data/imagecompare/earth_diffuse_ref.png diff --git a/modules/internal/data/imagecompare/earth_light_cmp.png b/data/internal/data/imagecompare/earth_light_cmp.png similarity index 100% rename from modules/internal/data/imagecompare/earth_light_cmp.png rename to data/internal/data/imagecompare/earth_light_cmp.png diff --git a/modules/internal/data/imagecompare/earth_light_ref.png b/data/internal/data/imagecompare/earth_light_ref.png similarity index 100% rename from modules/internal/data/imagecompare/earth_light_ref.png rename to data/internal/data/imagecompare/earth_light_ref.png diff --git a/modules/internal/data/imagecompare/earth_spot_cmp.png b/data/internal/data/imagecompare/earth_spot_cmp.png similarity index 100% rename from modules/internal/data/imagecompare/earth_spot_cmp.png rename to data/internal/data/imagecompare/earth_spot_cmp.png diff --git a/modules/internal/data/imagecompare/earth_spot_ref.png b/data/internal/data/imagecompare/earth_spot_ref.png similarity index 100% rename from modules/internal/data/imagecompare/earth_spot_ref.png rename to data/internal/data/imagecompare/earth_spot_ref.png diff --git a/modules/internal/data/imagecompare/earth_texture_cmp.png b/data/internal/data/imagecompare/earth_texture_cmp.png similarity index 100% rename from modules/internal/data/imagecompare/earth_texture_cmp.png rename to data/internal/data/imagecompare/earth_texture_cmp.png diff --git a/modules/internal/data/imagecompare/earth_texture_ref.png b/data/internal/data/imagecompare/earth_texture_ref.png similarity index 100% rename from modules/internal/data/imagecompare/earth_texture_ref.png rename to data/internal/data/imagecompare/earth_texture_ref.png diff --git a/modules/internal/data/imagecompare/empty_256x256.png b/data/internal/data/imagecompare/empty_256x256.png similarity index 100% rename from modules/internal/data/imagecompare/empty_256x256.png rename to data/internal/data/imagecompare/empty_256x256.png diff --git a/modules/internal/data/imagecompare/lessThan0-reference.png b/data/internal/data/imagecompare/lessThan0-reference.png similarity index 100% rename from modules/internal/data/imagecompare/lessThan0-reference.png rename to data/internal/data/imagecompare/lessThan0-reference.png diff --git a/modules/internal/data/imagecompare/lessThan0-result.png b/data/internal/data/imagecompare/lessThan0-result.png similarity index 100% rename from modules/internal/data/imagecompare/lessThan0-result.png rename to data/internal/data/imagecompare/lessThan0-result.png diff --git a/modules/internal/data/imagecompare/lessthan_vtx_cmp.png b/data/internal/data/imagecompare/lessthan_vtx_cmp.png similarity index 100% rename from modules/internal/data/imagecompare/lessthan_vtx_cmp.png rename to data/internal/data/imagecompare/lessthan_vtx_cmp.png diff --git a/modules/internal/data/imagecompare/lessthan_vtx_ref.png b/data/internal/data/imagecompare/lessthan_vtx_ref.png similarity index 100% rename from modules/internal/data/imagecompare/lessthan_vtx_ref.png rename to data/internal/data/imagecompare/lessthan_vtx_ref.png diff --git a/modules/internal/data/imagecompare/readpixels_msaa.png b/data/internal/data/imagecompare/readpixels_msaa.png similarity index 100% rename from modules/internal/data/imagecompare/readpixels_msaa.png rename to data/internal/data/imagecompare/readpixels_msaa.png diff --git a/modules/internal/data/imagecompare/readpixels_ref.png b/data/internal/data/imagecompare/readpixels_ref.png similarity index 100% rename from modules/internal/data/imagecompare/readpixels_ref.png rename to data/internal/data/imagecompare/readpixels_ref.png diff --git a/modules/internal/data/imagecompare/refract_frag_cmp.png b/data/internal/data/imagecompare/refract_frag_cmp.png similarity index 100% rename from modules/internal/data/imagecompare/refract_frag_cmp.png rename to data/internal/data/imagecompare/refract_frag_cmp.png diff --git a/modules/internal/data/imagecompare/refract_frag_ref.png b/data/internal/data/imagecompare/refract_frag_ref.png similarity index 100% rename from modules/internal/data/imagecompare/refract_frag_ref.png rename to data/internal/data/imagecompare/refract_frag_ref.png diff --git a/modules/internal/data/imagecompare/refract_vtx_cmp.png b/data/internal/data/imagecompare/refract_vtx_cmp.png similarity index 100% rename from modules/internal/data/imagecompare/refract_vtx_cmp.png rename to data/internal/data/imagecompare/refract_vtx_cmp.png diff --git a/modules/internal/data/imagecompare/refract_vtx_ref.png b/data/internal/data/imagecompare/refract_vtx_ref.png similarity index 100% rename from modules/internal/data/imagecompare/refract_vtx_ref.png rename to data/internal/data/imagecompare/refract_vtx_ref.png diff --git a/modules/internal/data/imagecompare/texfilter_cmp.png b/data/internal/data/imagecompare/texfilter_cmp.png similarity index 100% rename from modules/internal/data/imagecompare/texfilter_cmp.png rename to data/internal/data/imagecompare/texfilter_cmp.png diff --git a/modules/internal/data/imagecompare/texfilter_ref.png b/data/internal/data/imagecompare/texfilter_ref.png similarity index 100% rename from modules/internal/data/imagecompare/texfilter_ref.png rename to data/internal/data/imagecompare/texfilter_ref.png diff --git a/modules/internal/data/imagecompare/texfilter_vtx_linear_cmp.png b/data/internal/data/imagecompare/texfilter_vtx_linear_cmp.png similarity index 100% rename from modules/internal/data/imagecompare/texfilter_vtx_linear_cmp.png rename to data/internal/data/imagecompare/texfilter_vtx_linear_cmp.png diff --git a/modules/internal/data/imagecompare/texfilter_vtx_linear_ref.png b/data/internal/data/imagecompare/texfilter_vtx_linear_ref.png similarity index 100% rename from modules/internal/data/imagecompare/texfilter_vtx_linear_ref.png rename to data/internal/data/imagecompare/texfilter_vtx_linear_ref.png diff --git a/modules/internal/data/imagecompare/texfilter_vtx_nearest_cmp.png b/data/internal/data/imagecompare/texfilter_vtx_nearest_cmp.png similarity index 100% rename from modules/internal/data/imagecompare/texfilter_vtx_nearest_cmp.png rename to data/internal/data/imagecompare/texfilter_vtx_nearest_cmp.png diff --git a/modules/internal/data/imagecompare/texfilter_vtx_nearest_ref.png b/data/internal/data/imagecompare/texfilter_vtx_nearest_ref.png similarity index 100% rename from modules/internal/data/imagecompare/texfilter_vtx_nearest_ref.png rename to data/internal/data/imagecompare/texfilter_vtx_nearest_ref.png diff --git a/modules/internal/data/imagecompare/white_256x256.png b/data/internal/data/imagecompare/white_256x256.png similarity index 100% rename from modules/internal/data/imagecompare/white_256x256.png rename to data/internal/data/imagecompare/white_256x256.png diff --git a/modules/internal/data/imageio/rgb24_209x181.png b/data/internal/data/imageio/rgb24_209x181.png similarity index 100% rename from modules/internal/data/imageio/rgb24_209x181.png rename to data/internal/data/imageio/rgb24_209x181.png diff --git a/modules/internal/data/imageio/rgb24_256x256.png b/data/internal/data/imageio/rgb24_256x256.png similarity index 100% rename from modules/internal/data/imageio/rgb24_256x256.png rename to data/internal/data/imageio/rgb24_256x256.png diff --git a/modules/internal/data/imageio/rgba32_207x219.png b/data/internal/data/imageio/rgba32_207x219.png similarity index 100% rename from modules/internal/data/imageio/rgba32_207x219.png rename to data/internal/data/imageio/rgba32_207x219.png diff --git a/modules/internal/data/imageio/rgba32_256x256.png b/data/internal/data/imageio/rgba32_256x256.png similarity index 100% rename from modules/internal/data/imageio/rgba32_256x256.png rename to data/internal/data/imageio/rgba32_256x256.png diff --git a/modules/internal/CMakeLists.txt b/modules/internal/CMakeLists.txt index 3dd9ad0..567bb60 100644 --- a/modules/internal/CMakeLists.txt +++ b/modules/internal/CMakeLists.txt @@ -25,4 +25,4 @@ set(DE_INTERNAL_TESTS_LIBS add_deqp_module(de-internal-tests "${DE_INTERNAL_TESTS_SRCS}" "${DE_INTERNAL_TESTS_LIBS}" ditTestPackageEntry.cpp) -add_data_dir(de-internal-tests data internal/data) +add_data_dir(de-internal-tests ../../data/internal/data internal/data) -- 2.7.4