[Piglit] [PATCH 37/40] Port vp-min.vpfp to shader_runner

[Kenneth Graunke]

This commit was autogenerated by Python and Bash scripting.
---
 tests/all.py                                     |  1 -
 tests/shaders/generic/vp-min.vpfp                | 21 -----------------
 tests/spec/arb_vertex_program/vp-min.shader_test | 30 ++++++++++++++++++++++++
 3 files changed, 30 insertions(+), 22 deletions(-)
 delete mode 100644 tests/shaders/generic/vp-min.vpfp
 create mode 100644 tests/spec/arb_vertex_program/vp-min.shader_test

diff --git a/tests/all.py b/tests/all.py
index 7661578..ef462ad 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -2592,7 +2592,6 @@ with profile.group_manager(
     g(['vp-address-04'], run_concurrent=False)
     g(['vp-bad-program'], run_concurrent=False)
     g(['vp-max-array'], run_concurrent=False)
-    add_vpfpgeneric(g, 'vp-min')
     add_vpfpgeneric(g, 'vp-sge-alias')
     add_vpfpgeneric(g, 'vp-two-constants')
 
diff --git a/tests/shaders/generic/vp-min.vpfp b/tests/shaders/generic/vp-min.vpfp
deleted file mode 100644
index 6cd9ea0..0000000
--- a/tests/shaders/generic/vp-min.vpfp
+++ /dev/null
@@ -1,21 +0,0 @@
-; Detects whether or not the implementation correctly handles aliasing
-; of src/dst in EXP.
-
-!!ARBvp1.0
-OPTION ARB_position_invariant;
-
-TEMP temp1, temp2;
-
-MOV temp1, {1.0, 0.25, 2.0, -1.0};
-MOV temp2, {0.25, 1.0, -1.0, 2.0};
-MIN temp1, temp1, temp2;
-ADD result.color, temp1, {0.0, 0.0, 1.25, 1.25};
-END
-
-!!ARBfp1.0
-MOV result.color, fragment.color;
-END
-
-!!test
-expected          0.25     0.25      0.25      0.25
-
diff --git a/tests/spec/arb_vertex_program/vp-min.shader_test b/tests/spec/arb_vertex_program/vp-min.shader_test
new file mode 100644
index 0000000..857289c
--- /dev/null
+++ b/tests/spec/arb_vertex_program/vp-min.shader_test
@@ -0,0 +1,30 @@
+# Detects whether or not the implementation correctly handles aliasing
+# of src/dst in EXP.
+
+[require]
+GL >= 1.3
+ARB_vertex_program
+ARB_fragment_program
+
+[vertex program]
+!!ARBvp1.0
+OPTION ARB_position_invariant;
+
+TEMP temp1, temp2;
+
+MOV temp1, {1.0, 0.25, 2.0, -1.0};
+MOV temp2, {0.25, 1.0, -1.0, 2.0};
+MIN temp1, temp1, temp2;
+ADD result.color, temp1, {0.0, 0.0, 1.25, 1.25};
+END
+
+[fragment program]
+!!ARBfp1.0
+MOV result.color, fragment.color;
+END
+
+[test]
+ortho 0 1 0 1
+draw rect 0 0 1 1
+probe all rgba  0.25 0.25 0.25 0.25
+
-- 
2.4.2