[Piglit] [PATCH 1/5] glsl-es-1.00: move contents of glsl-1.00 to glsl-es-1.00

[Tom Gall]

Change all.tests to reflect new location of glsl-1.00 to
glsl-es-1.00 and add es as part of the group name.

In all.tests, add glsl-es-1.00/execution as a shader test.

Move contents of glsl-1.00/compiler/arithmetic-operators/
to glsl-es-1.00/compiler/arithmetic-operators.

Remove blank line at end of
tests/spec/glsl-1.00/compiler/assignment-operators/modulus-assign-00.frag

v2: switch to glsl-es-1.00 instead of glsl-1.00 based on list
discussion

Signed-off-by: Tom Gall <tom.gall at linaro.org>
---
 tests/all.tests                                     |   12 ++++++++----
 .../arithmetic-operators/division-by-zero-01.frag   |   19 -------------------
 .../arithmetic-operators/division-by-zero-02.frag   |   19 -------------------
 .../compiler/arithmetic-operators/modulus-00.frag   |   18 ------------------
 .../assignment-operators/modulus-assign-00.frag     |    1 -
 .../arithmetic-operators/division-by-zero-01.frag   |   18 ++++++++++++++++++
 .../arithmetic-operators/division-by-zero-02.frag   |   18 ++++++++++++++++++
 .../compiler/arithmetic-operators/modulus-00.frag   |   17 +++++++++++++++++
 8 files changed, 61 insertions(+), 61 deletions(-)
 delete mode 100644 tests/spec/glsl-1.00/compiler/arithmetic-operators/division-by-zero-01.frag
 delete mode 100644 tests/spec/glsl-1.00/compiler/arithmetic-operators/division-by-zero-02.frag
 delete mode 100644 tests/spec/glsl-1.00/compiler/arithmetic-operators/modulus-00.frag
 create mode 100644 tests/spec/glsl-es-1.00/compiler/arithmetic-operators/division-by-zero-01.frag
 create mode 100644 tests/spec/glsl-es-1.00/compiler/arithmetic-operators/division-by-zero-02.frag
 create mode 100644 tests/spec/glsl-es-1.00/compiler/arithmetic-operators/modulus-00.frag

diff --git a/tests/all.tests b/tests/all.tests
index f2229c6..074dd73 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -684,11 +684,15 @@ spec['!OpenGL 3.1'] = gl31
 gl31['genned-names'] = concurrent_test('gl-3.1-genned-names')
 gl31['minmax'] = concurrent_test('gl-3.1-minmax')
 
-# Group spec/glsl-1.00
-spec['glsl-1.00'] = Group()
-import_glsl_parser_tests(spec['glsl-1.00'],
-			 os.path.join(testsDir, 'spec', 'glsl-1.00'),
+# Group spec/glsl-es-1.00
+spec['glsl-es-1.00'] = Group()
+import_glsl_parser_tests(spec['glsl-es-1.00'],
+			 os.path.join(testsDir, 'spec', 'glsl-es-1.00'),
 			 ['compiler'])
+spec['glsl-es-1.00']['execution'] = Group()
+add_shader_test_dir(spec['glsl-es-1.00']['execution'],
+			 os.path.join(testsDir, 'spec', 'glsl-es-1.00', 'execution'),
+			 recursive=True)
 
 # Group spec/glsl-1.10
 spec['glsl-1.10'] = Group()
diff --git a/tests/spec/glsl-1.00/compiler/arithmetic-operators/division-by-zero-01.frag b/tests/spec/glsl-1.00/compiler/arithmetic-operators/division-by-zero-01.frag
deleted file mode 100644
index a3dda0e..0000000
--- a/tests/spec/glsl-1.00/compiler/arithmetic-operators/division-by-zero-01.frag
+++ /dev/null
@@ -1,19 +0,0 @@
-// [config]
-// expect_result: pass
-// glsl_version: 1.00
-// [end config]
-//
-// Division by zero is legal for floating point values.
-//
-// From section 5.9 of the GLSL ES 1.00 spec:
-//     Dividing by zero does not cause an exception but does result in an
-//     unspecified value.
-
-#version 100
-
-float
-f() {
-    float x = 1.0 / 0.0;
-    return x;
-}
-
diff --git a/tests/spec/glsl-1.00/compiler/arithmetic-operators/division-by-zero-02.frag b/tests/spec/glsl-1.00/compiler/arithmetic-operators/division-by-zero-02.frag
deleted file mode 100644
index a93ed7f..0000000
--- a/tests/spec/glsl-1.00/compiler/arithmetic-operators/division-by-zero-02.frag
+++ /dev/null
@@ -1,19 +0,0 @@
-// [config]
-// expect_result: pass
-// glsl_version: 1.00
-// [end config]
-//
-// Division by zero is legal for integer values.
-//
-// From section 5.9 of the GLSL ES 1.00 spec:
-//     Dividing by zero does not cause an exception but does result in an
-//     unspecified value.
-
-#version 100
-
-int
-f() {
-    int x = 1 / 0;
-    return x;
-}
-
diff --git a/tests/spec/glsl-1.00/compiler/arithmetic-operators/modulus-00.frag b/tests/spec/glsl-1.00/compiler/arithmetic-operators/modulus-00.frag
deleted file mode 100644
index 8032e7a..0000000
--- a/tests/spec/glsl-1.00/compiler/arithmetic-operators/modulus-00.frag
+++ /dev/null
@@ -1,18 +0,0 @@
-// [config]
-// expect_result: fail
-// glsl_version: 1.00
-// [end config]
-//
-// The modulus operator '%' is reserved.
-//
-// From section 5.9 of the GLSL ES 1.00 spec:
-//     The operator remainder (%) is reserved for future use.
-
-#version 100
-
-int
-f() {
-    int tea_time = 15 % 24;
-    return tea_time;
-}
-
diff --git a/tests/spec/glsl-1.00/compiler/assignment-operators/modulus-assign-00.frag b/tests/spec/glsl-1.00/compiler/assignment-operators/modulus-assign-00.frag
index c89e218..7b35a9a 100644
--- a/tests/spec/glsl-1.00/compiler/assignment-operators/modulus-assign-00.frag
+++ b/tests/spec/glsl-1.00/compiler/assignment-operators/modulus-assign-00.frag
@@ -18,4 +18,3 @@ f() {
     x %= 4;
     return x;
 }
-
diff --git a/tests/spec/glsl-es-1.00/compiler/arithmetic-operators/division-by-zero-01.frag b/tests/spec/glsl-es-1.00/compiler/arithmetic-operators/division-by-zero-01.frag
new file mode 100644
index 0000000..33094f7
--- /dev/null
+++ b/tests/spec/glsl-es-1.00/compiler/arithmetic-operators/division-by-zero-01.frag
@@ -0,0 +1,18 @@
+// [config]
+// expect_result: pass
+// glsl_version: 1.00
+// [end config]
+//
+// Division by zero is legal for floating point values.
+//
+// From section 5.9 of the GLSL ES 1.00 spec:
+//     Dividing by zero does not cause an exception but does result in an
+//     unspecified value.
+
+#version 100
+
+float
+f() {
+    float x = 1.0 / 0.0;
+    return x;
+}
diff --git a/tests/spec/glsl-es-1.00/compiler/arithmetic-operators/division-by-zero-02.frag b/tests/spec/glsl-es-1.00/compiler/arithmetic-operators/division-by-zero-02.frag
new file mode 100644
index 0000000..f195214
--- /dev/null
+++ b/tests/spec/glsl-es-1.00/compiler/arithmetic-operators/division-by-zero-02.frag
@@ -0,0 +1,18 @@
+// [config]
+// expect_result: pass
+// glsl_version: 1.00
+// [end config]
+//
+// Division by zero is legal for integer values.
+//
+// From section 5.9 of the GLSL ES 1.00 spec:
+//     Dividing by zero does not cause an exception but does result in an
+//     unspecified value.
+
+#version 100
+
+int
+f() {
+    int x = 1 / 0;
+    return x;
+}
diff --git a/tests/spec/glsl-es-1.00/compiler/arithmetic-operators/modulus-00.frag b/tests/spec/glsl-es-1.00/compiler/arithmetic-operators/modulus-00.frag
new file mode 100644
index 0000000..1204c6f
--- /dev/null
+++ b/tests/spec/glsl-es-1.00/compiler/arithmetic-operators/modulus-00.frag
@@ -0,0 +1,17 @@
+// [config]
+// expect_result: fail
+// glsl_version: 1.00
+// [end config]
+//
+// The modulus operator '%' is reserved.
+//
+// From section 5.9 of the GLSL ES 1.00 spec:
+//     The operator remainder (%) is reserved for future use.
+
+#version 100
+
+int
+f() {
+    int tea_time = 15 % 24;
+    return tea_time;
+}
-- 
1.7.10.4