[Piglit] [PATCH 2/3] all.tests: move all tests from the vpfpgeneric group into spec

[Marek Olšák]

---
 tests/all.tests |   95 +++++++++++++++++++++++++++++--------------------------
 1 files changed, 50 insertions(+), 45 deletions(-)

diff --git a/tests/all.tests b/tests/all.tests
index 7bc0eb0..0e46a70 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -484,51 +484,8 @@ add_plain_test(shaders, 'useshaderprogram-bad-type')
 add_plain_test(shaders, 'useshaderprogram-bad-program')
 add_plain_test(shaders, 'useshaderprogram-flushverts-1')
 
-vpfpgeneric = Group()
-def add_vpfpgeneric(name):
-	vpfpgeneric[name] = PlainExecTest(['vpfp-generic', '-auto', testsDir + '/shaders/generic/' + name + '.vpfp'])
-add_vpfpgeneric('arl')
-add_vpfpgeneric('big-param')
-add_vpfpgeneric('dataflow-bug')
-add_vpfpgeneric('fdo30337a')
-add_vpfpgeneric('fdo30337b')
-add_vpfpgeneric('fdo38145')
-add_vpfpgeneric('fogcoord-dp3')
-add_vpfpgeneric('fogcoord-dph')
-add_vpfpgeneric('fogcoord-dp4')
-add_vpfpgeneric('fp-arb-fragment-coord-conventions-none')
-add_vpfpgeneric('fp-arb-fragment-coord-conventions-integer')
-add_vpfpgeneric('fp-cmp')
-add_vpfpgeneric('fp-dst-aliasing-1')
-add_vpfpgeneric('fp-dst-aliasing-2')
-add_vpfpgeneric('fp-ex2-sat')
-add_vpfpgeneric('fp-two-constants')
-add_vpfpgeneric('nv-mov')
-add_vpfpgeneric('nv-add')
-add_vpfpgeneric('nv-arl')
-add_vpfpgeneric('nv-init-zero-reg')
-add_vpfpgeneric('nv-init-zero-addr')
-add_vpfpgeneric('vp-arl-constant-array')
-add_vpfpgeneric('vp-arl-constant-array-huge')
-add_vpfpgeneric('vp-arl-constant-array-huge-varying')
-add_vpfpgeneric('vp-arl-constant-array-huge-offset')
-add_vpfpgeneric('vp-arl-constant-array-huge-offset-neg')
-add_vpfpgeneric('vp-arl-constant-array-huge-overwritten')
-add_vpfpgeneric('vp-arl-constant-array-huge-relative-offset')
-add_vpfpgeneric('vp-arl-constant-array-varying')
-add_vpfpgeneric('vp-arl-env-array')
-add_vpfpgeneric('vp-arl-local-array')
-add_vpfpgeneric('vp-arl-neg-array')
-add_vpfpgeneric('vp-arl-neg-array-2')
-add_vpfpgeneric('vp-constant-array')
-add_vpfpgeneric('vp-constant-array-huge')
-add_vpfpgeneric('vp-constant-negate')
-add_vpfpgeneric('vp-exp-alias')
-add_vpfpgeneric('vp-max')
-add_vpfpgeneric('vp-min')
-add_vpfpgeneric('vp-sge-alias')
-add_vpfpgeneric('vp-two-constants')
-shaders['vpfp-generic'] = vpfpgeneric
+def add_vpfpgeneric(group, name):
+	group[name] = PlainExecTest(['vpfp-generic', '-auto', testsDir + '/shaders/generic/' + name + '.vpfp'])
 
 glx = Group()
 add_plain_test(glx, 'glx-copy-sub-buffer')
@@ -1038,6 +995,15 @@ add_shader_test_dir(spec['ARB_fragment_program'],
 	            os.path.join(testsDir, 'spec', 'arb_fragment_program'),
 		    recursive=True)
 arb_fragment_program['minmax'] = concurrent_test('arb_fragment_program-minmax')
+add_vpfpgeneric(arb_fragment_program, 'fdo30337a')
+add_vpfpgeneric(arb_fragment_program, 'fdo30337b')
+add_vpfpgeneric(arb_fragment_program, 'fdo38145')
+add_vpfpgeneric(arb_fragment_program, 'fp-cmp')
+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')
+
 
 # Group ARB_fragment_program_shadow
 arb_fragment_program_shadow = Group()
@@ -1046,6 +1012,11 @@ add_shader_test_dir(spec['ARB_fragment_program_shadow'],
 	            os.path.join(testsDir, 'spec', 'arb_fragment_program_shadow'),
 		    recursive=True)
 
+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')
+
 # Group ARB_framebuffer_object
 arb_framebuffer_object = Group()
 spec['ARB_framebuffer_object'] = arb_framebuffer_object
@@ -1290,6 +1261,40 @@ arb_vertex_program['getlocal4d-with-error'] = PlainExecTest(['arb_vertex_program
 arb_vertex_program['clip-plane-transformation arb'] = concurrent_test('clip-plane-transformation arb')
 arb_vertex_program['minmax'] = concurrent_test('arb_vertex_program-minmax')
 add_plain_test(arb_vertex_program, 'fdo24066')
+add_vpfpgeneric(arb_vertex_program, 'arl')
+add_vpfpgeneric(arb_vertex_program, 'big-param')
+add_vpfpgeneric(arb_vertex_program, 'dataflow-bug')
+add_vpfpgeneric(arb_vertex_program, 'fogcoord-dp3')
+add_vpfpgeneric(arb_vertex_program, 'fogcoord-dph')
+add_vpfpgeneric(arb_vertex_program, 'fogcoord-dp4')
+add_vpfpgeneric(arb_vertex_program, 'vp-arl-constant-array')
+add_vpfpgeneric(arb_vertex_program, 'vp-arl-constant-array-huge')
+add_vpfpgeneric(arb_vertex_program, 'vp-arl-constant-array-huge-varying')
+add_vpfpgeneric(arb_vertex_program, 'vp-arl-constant-array-huge-offset')
+add_vpfpgeneric(arb_vertex_program, 'vp-arl-constant-array-huge-offset-neg')
+add_vpfpgeneric(arb_vertex_program, 'vp-arl-constant-array-huge-overwritten')
+add_vpfpgeneric(arb_vertex_program, 'vp-arl-constant-array-huge-relative-offset')
+add_vpfpgeneric(arb_vertex_program, 'vp-arl-constant-array-varying')
+add_vpfpgeneric(arb_vertex_program, 'vp-arl-env-array')
+add_vpfpgeneric(arb_vertex_program, 'vp-arl-local-array')
+add_vpfpgeneric(arb_vertex_program, 'vp-arl-neg-array')
+add_vpfpgeneric(arb_vertex_program, 'vp-arl-neg-array-2')
+add_vpfpgeneric(arb_vertex_program, 'vp-constant-array')
+add_vpfpgeneric(arb_vertex_program, 'vp-constant-array-huge')
+add_vpfpgeneric(arb_vertex_program, 'vp-constant-negate')
+add_vpfpgeneric(arb_vertex_program, 'vp-exp-alias')
+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')
+
+nv_vertex_program = Group()
+spec['NV_vertex_program'] = nv_vertex_program
+add_vpfpgeneric(nv_vertex_program, 'nv-mov')
+add_vpfpgeneric(nv_vertex_program, 'nv-add')
+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')
 
 ext_framebuffer_blit = Group()
 spec['EXT_framebuffer_blit'] = ext_framebuffer_blit
-- 
1.7.4.1