Merge pull request #1007 from zhenyao/move

Move tests from conformance2/core to various folders and remove core.
KhronosGroup · May 27, 2015 · 867de0e · 867de0e
2 parents 46a6a22 + 4c135a9
commit 867de0e
Show file tree

Hide file tree

Showing 16 changed files with 12 additions and 10 deletions.
diff --git a/sdk/tests/conformance2/00_test_list.txt b/sdk/tests/conformance2/00_test_list.txt
@@ -4,5 +4,7 @@ context/00_test_list.txt
 core/00_test_list.txt
 glsl3/00_test_list.txt
 misc/00_test_list.txt
+rendering/00_test_list.txt
 state/00_test_list.txt
 textures/00_test_list.txt
+vertex_arrays/00_test_list.txt
diff --git a/sdk/tests/conformance2/core/00_test_list.txt b/sdk/tests/conformance2/core/00_test_list.txt
diff --git a/sdk/tests/conformance2/glsl3/00_test_list.txt b/sdk/tests/conformance2/glsl3/00_test_list.txt
@@ -4,5 +4,6 @@ array-assign-constructor.html
 array-equality.html
 array-in-complex-expression.html
 array-length-side-effects.html
+frag-depth.html
 misplaced-version-directive.html
 shader-linking.html
diff --git a/sdk/tests/conformance2/core/frag-depth.html → sdk/tests/conformance2/glsl3/frag-depth.html b/sdk/tests/conformance2/core/frag-depth.html → sdk/tests/conformance2/glsl3/frag-depth.html
diff --git a/sdk/tests/conformance2/rendering/00_test_list.txt b/sdk/tests/conformance2/rendering/00_test_list.txt
@@ -0,0 +1,3 @@
+draw-buffers.html
+element-index-uint.html
+instanced-arrays.html
diff --git a/...tests/conformance2/core/draw-buffers.html → .../conformance2/rendering/draw-buffers.html b/...tests/conformance2/core/draw-buffers.html → .../conformance2/rendering/draw-buffers.html
diff --git a/...conformance2/core/element-index-uint.html → ...rmance2/rendering/element-index-uint.html b/...conformance2/core/element-index-uint.html → ...rmance2/rendering/element-index-uint.html
diff --git a/...s/conformance2/core/instanced-arrays.html → ...formance2/rendering/instanced-arrays.html b/...s/conformance2/core/instanced-arrays.html → ...formance2/rendering/instanced-arrays.html
diff --git a/sdk/tests/conformance2/textures/00_test_list.txt b/sdk/tests/conformance2/textures/00_test_list.txt
@@ -1,3 +1,8 @@
 gl-get-tex-parameter.html
 tex-input-validation.html
+tex-mipmap-levels.html
+tex-new-formats.html
+tex-storage-2d.html
+tex-storage-and-subimage-3d.html
 texel-fetch-undefined.html
+texture-npot.html
diff --git a/.../conformance2/core/tex-mipmap-levels.html → ...formance2/textures/tex-mipmap-levels.html b/.../conformance2/core/tex-mipmap-levels.html → ...formance2/textures/tex-mipmap-levels.html
diff --git a/...ts/conformance2/core/tex-new-formats.html → ...onformance2/textures/tex-new-formats.html b/...ts/conformance2/core/tex-new-formats.html → ...onformance2/textures/tex-new-formats.html
diff --git a/...sts/conformance2/core/tex-storage-2d.html → ...conformance2/textures/tex-storage-2d.html b/...sts/conformance2/core/tex-storage-2d.html → ...conformance2/textures/tex-storage-2d.html
diff --git a/...ce2/core/tex-storage-and-subimage-3d.html → ...textures/tex-storage-and-subimage-3d.html b/...ce2/core/tex-storage-and-subimage-3d.html → ...textures/tex-storage-and-subimage-3d.html
diff --git a/...tests/conformance2/core/texture-npot.html → ...s/conformance2/textures/texture-npot.html b/...tests/conformance2/core/texture-npot.html → ...s/conformance2/textures/texture-npot.html
diff --git a/sdk/tests/conformance2/vertex_arrays/00_test_list.txt b/sdk/tests/conformance2/vertex_arrays/00_test_list.txt
@@ -0,0 +1 @@
+vertex-array-object.html
diff --git a/...onformance2/core/vertex-array-object.html → ...e2/vertex_arrays/vertex-array-object.html b/...onformance2/core/vertex-array-object.html → ...e2/vertex_arrays/vertex-array-object.html