[Piglit] [PATCH 3/3] all.tests: move more VP and FP tests into spec

[Marek Olšák]

---
 tests/all.tests |   73 ++++++++++++++++++++++++++++++-------------------------
 1 files changed, 40 insertions(+), 33 deletions(-)

diff --git a/tests/all.tests b/tests/all.tests
index 0e46a70..341d021 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -330,28 +330,9 @@ add_shader_test_dir(shaders,
                     recursive=True)
 add_plain_test(shaders, 'activeprogram-bad-program')
 add_plain_test(shaders, 'activeprogram-get')
-add_plain_test(shaders, 'ati-fs-bad-delete')
 add_plain_test(shaders, 'attribute0')
 add_plain_test(shaders, 'createshaderprogram-bad-type')
 add_plain_test(shaders, 'createshaderprogram-attached-shaders')
-add_plain_test(shaders, 'fp-abs-01')
-add_plain_test(shaders, 'fp-abs-02')
-add_plain_test(shaders, 'fp-condition_codes-01')
-add_plain_test(shaders, 'fp-fog')
-add_plain_test(shaders, 'fp-formats')
-add_plain_test(shaders, 'fp-lit-mask')
-add_plain_test(shaders, 'fp-lit-src-equals-dst')
-add_plain_test(shaders, 'fp-fragment-position')
-add_plain_test(shaders, 'fp-kil')
-add_plain_test(shaders, 'fp-incomplete-tex')
-add_plain_test(shaders, 'fp-indirections')
-add_plain_test(shaders, 'fp-indirections2')
-add_plain_test(shaders, 'fp-long-alu')
-add_plain_test(shaders, 'fp-rfl')
-add_plain_test(shaders, 'fp-set-01')
-add_plain_test(shaders, 'fp-set-02')
-add_plain_test(shaders, 'fp-unpack-01')
-add_plain_test(shaders, 'trinity-fp1')
 add_plain_test(shaders, 'glsl-arb-fragment-coord-conventions')
 add_plain_test(shaders, 'glsl-arb-fragment-coord-conventions-define')
 add_plain_test(shaders, 'glsl-bug-22603')
@@ -426,19 +407,7 @@ add_plain_test(shaders, 'glsl-vs-mov-after-deref')
 add_plain_test(shaders, 'glsl-vs-mvp-statechange')
 add_plain_test(shaders, 'glsl-vs-raytrace-bug26691')
 add_plain_test(shaders, 'glsl-vs-statechange-1')
-add_plain_test(shaders, 'vp-address-01')
-add_plain_test(shaders, 'vp-address-02')
-add_plain_test(shaders, 'vp-address-03')
-add_plain_test(shaders, 'vp-address-04')
-add_plain_test(shaders, 'vp-address-05')
-add_plain_test(shaders, 'vp-address-06')
-add_plain_test(shaders, 'vp-bad-program')
-add_plain_test(shaders, 'vp-clipdistance-01')
-add_plain_test(shaders, 'vp-clipdistance-02')
-add_plain_test(shaders, 'vp-clipdistance-03')
-add_plain_test(shaders, 'vp-clipdistance-04')
 add_plain_test(shaders, 'vp-combined-image-units')
-add_plain_test(shaders, 'vp-max-array')
 add_plain_test(shaders, 'glsl-derivs')
 add_plain_test(shaders, 'glsl-deriv-varyings')
 add_plain_test(shaders, 'glsl-fwidth')
@@ -1003,7 +972,19 @@ add_vpfpgeneric(arb_fragment_program, 'fp-dst-aliasing-1')
 add_vpfpgeneric(arb_fragment_program, 'fp-dst-aliasing-2')
 add_vpfpgeneric(arb_fragment_program, 'fp-ex2-sat')
 add_vpfpgeneric(arb_fragment_program, 'fp-two-constants')
-
+add_plain_test(arb_fragment_program, 'fp-abs-01')
+add_plain_test(arb_fragment_program, 'fp-fog')
+add_plain_test(arb_fragment_program, 'fp-formats')
+add_plain_test(arb_fragment_program, 'fp-fragment-position')
+add_plain_test(arb_fragment_program, 'fp-incomplete-tex')
+add_plain_test(arb_fragment_program, 'fp-indirections')
+add_plain_test(arb_fragment_program, 'fp-indirections2')
+add_plain_test(arb_fragment_program, 'fp-kil')
+add_plain_test(arb_fragment_program, 'fp-lit-mask')
+add_plain_test(arb_fragment_program, 'fp-lit-src-equals-dst')
+add_plain_test(arb_fragment_program, 'fp-long-alu')
+add_plain_test(arb_fragment_program, 'fp-set-01')
+add_plain_test(arb_fragment_program, 'trinity-fp1')
 
 # Group ARB_fragment_program_shadow
 arb_fragment_program_shadow = Group()
@@ -1012,11 +993,23 @@ add_shader_test_dir(spec['ARB_fragment_program_shadow'],
 	            os.path.join(testsDir, 'spec', 'arb_fragment_program_shadow'),
 		    recursive=True)
 
+nv_fragment_program_option = Group()
+spec['NV_fragment_program_option'] = nv_fragment_program_option
+add_plain_test(nv_fragment_program_option, 'fp-abs-02')
+add_plain_test(nv_fragment_program_option, 'fp-condition_codes-01')
+add_plain_test(nv_fragment_program_option, 'fp-rfl')
+add_plain_test(nv_fragment_program_option, 'fp-set-02')
+add_plain_test(nv_fragment_program_option, 'fp-unpack-01')
+
 arb_fragment_coord_conventions = Group()
 spec['ARB_fragment_coord_conventions'] = arb_fragment_coord_conventions
 add_vpfpgeneric(arb_fragment_coord_conventions, 'fp-arb-fragment-coord-conventions-none')
 add_vpfpgeneric(arb_fragment_coord_conventions, 'fp-arb-fragment-coord-conventions-integer')
 
+ati_fragment_shader = Group()
+spec['ATI_fragment_shader'] = ati_fragment_shader
+add_plain_test(ati_fragment_shader, 'ati-fs-bad-delete')
+
 # Group ARB_framebuffer_object
 arb_framebuffer_object = Group()
 spec['ARB_framebuffer_object'] = arb_framebuffer_object
@@ -1253,7 +1246,6 @@ add_plain_test(arb_vertex_buffer_object, 'fdo14575')
 add_plain_test(arb_vertex_buffer_object, 'fdo22540')
 add_plain_test(arb_vertex_buffer_object, 'fdo31934')
 
-
 arb_vertex_program = Group()
 spec['ARB_vertex_program'] = arb_vertex_program
 arb_vertex_program['getenv4d-with-error'] = PlainExecTest(['arb_vertex_program-getenv4d-with-error', '-auto'])
@@ -1287,6 +1279,11 @@ add_vpfpgeneric(arb_vertex_program, 'vp-max')
 add_vpfpgeneric(arb_vertex_program, 'vp-min')
 add_vpfpgeneric(arb_vertex_program, 'vp-sge-alias')
 add_vpfpgeneric(arb_vertex_program, 'vp-two-constants')
+add_plain_test(arb_vertex_program, 'vp-address-01')
+add_plain_test(arb_vertex_program, 'vp-address-02')
+add_plain_test(arb_vertex_program, 'vp-address-04')
+add_plain_test(arb_vertex_program, 'vp-bad-program')
+add_plain_test(arb_vertex_program, 'vp-max-array')
 
 nv_vertex_program = Group()
 spec['NV_vertex_program'] = nv_vertex_program
@@ -1296,6 +1293,16 @@ add_vpfpgeneric(nv_vertex_program, 'nv-arl')
 add_vpfpgeneric(nv_vertex_program, 'nv-init-zero-reg')
 add_vpfpgeneric(nv_vertex_program, 'nv-init-zero-addr')
 
+nv_vertex_program2_option = Group()
+spec['NV_vertex_program2_option'] = nv_vertex_program2_option
+add_plain_test(nv_vertex_program2_option, 'vp-address-03')
+add_plain_test(nv_vertex_program2_option, 'vp-address-05')
+add_plain_test(nv_vertex_program2_option, 'vp-address-06')
+add_plain_test(nv_vertex_program2_option, 'vp-clipdistance-01')
+add_plain_test(nv_vertex_program2_option, 'vp-clipdistance-02')
+add_plain_test(nv_vertex_program2_option, 'vp-clipdistance-03')
+add_plain_test(nv_vertex_program2_option, 'vp-clipdistance-04')
+
 ext_framebuffer_blit = Group()
 spec['EXT_framebuffer_blit'] = ext_framebuffer_blit
 add_plain_test(ext_framebuffer_blit, 'fbo-blit')
-- 
1.7.4.1