Now it's called "empty-begin-end-clause".
---
tests/all.py | 2 +-
tests/bugs/CMakeLists.gl.txt | 1 -
tests/bugs/fdo23489.c | 40 -------------------
tests/spec/gl-1.0/CMakeLists.gl.txt | 1 +
tests/spec/gl-1.0/empty-begin-end-clause.c | 64 ++++++++++++++++++++++++++++++
5 files changed, 66 insertions(+), 42 deletions(-)
delete mode 100644 tests/bugs/fdo23489.c
create mode 100644 tests/spec/gl-1.0/empty-begin-end-clause.c
diff --git a/tests/all.py b/tests/all.py
index c7baf7d..18a8f05 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -723,6 +723,7 @@ with profile.test_list.group_manager(
g(['gl-1.0-edgeflag'])
g(['gl-1.0-edgeflag-const'])
g(['gl-1.0-edgeflag-quads'])
+ g(['gl-1.0-empty-begin-end-clause'])
g(['gl-1.0-long-dlist'])
g(['gl-1.0-readpixels-oob'])
g(['gl-1.0-rendermode-feedback'])
@@ -761,7 +762,6 @@ with profile.test_list.group_manager(
g(['copyteximage', '1D'])
g(['copyteximage', '2D'])
g(['gl-1.1-read-pixels-after-display-list'])
- g(['fdo23489'])
g(['fdo23670-depth_test'])
g(['fdo23670-drawpix_stencil'])
g(['tri-tex-crash'])
diff --git a/tests/bugs/CMakeLists.gl.txt b/tests/bugs/CMakeLists.gl.txt
index e424d9a..c9e2cbf 100644
--- a/tests/bugs/CMakeLists.gl.txt
+++ b/tests/bugs/CMakeLists.gl.txt
@@ -10,7 +10,6 @@ link_libraries (
${OPENGL_gl_LIBRARY}
)
-piglit_add_executable (fdo23489 fdo23489.c)
piglit_add_executable (fdo23670-depth_test fdo23670-depth_test.c)
piglit_add_executable (fdo23670-drawpix_stencil fdo23670-drawpix_stencil.c)
piglit_add_executable (fdo24066 fdo24066.c)
diff --git a/tests/bugs/fdo23489.c b/tests/bugs/fdo23489.c
deleted file mode 100644
index 848a190..0000000
--- a/tests/bugs/fdo23489.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Test case from fdo bug #23489
- * http://bugs.freedesktop.org/show_bug.cgi?id=23489
- */
-
-#include "piglit-util-gl.h"
-
-PIGLIT_GL_TEST_CONFIG_BEGIN
-
- config.supports_gl_compat_version = 10;
-
- config.window_width = 250;
- config.window_height = 250;
- config.window_visual = PIGLIT_GL_VISUAL_RGB;
- config.khr_no_error_support = PIGLIT_NO_ERRORS;
-
-PIGLIT_GL_TEST_CONFIG_END
-
-enum piglit_result
-piglit_display(void)
-{
- int i;
-
- for (i = 0; i < 100; i++) {
- glBegin(GL_LINES);
- glEnd();
- }
- glFlush();
-
- return PIGLIT_PASS;
-}
-
-void
-piglit_init(int argc, char **argv)
-{
- glClearColor(0.0, 0.0, 0.0, 0.0);
- glMatrixMode(GL_PROJECTION);
- glLoadIdentity();
- glOrtho(0.0, 1.0, 0.0, 1.0, -1.0, 1.0);
-}
diff --git a/tests/spec/gl-1.0/CMakeLists.gl.txt
b/tests/spec/gl-1.0/CMakeLists.gl.txt
index 7ece6ce..ca924e0 100644
--- a/tests/spec/gl-1.0/CMakeLists.gl.txt
+++ b/tests/spec/gl-1.0/CMakeLists.gl.txt
@@ -18,6 +18,7 @@ piglit_add_executable (gl-1.0-drawpixels-color-index
drawpixels-color-index.c)
piglit_add_executable (gl-1.0-edgeflag edgeflag.c)
piglit_add_executable (gl-1.0-edgeflag-const edgeflag-const.c)
piglit_add_executable (gl-1.0-edgeflag-quads edgeflag-quads.c)
+piglit_add_executable (gl-1.0-empty-begin-end-clause empty-begin-end-clause.c)
piglit_add_executable (gl-1.0-fpexceptions fpexceptions.c)
piglit_add_executable (gl-1.0-front-invalidate-back front-invalidate-back.c)
piglit_add_executable (gl-1.0-logicop logicop.c)
diff --git a/tests/spec/gl-1.0/empty-begin-end-clause.c
b/tests/spec/gl-1.0/empty-begin-end-clause.c
new file mode 100644
index 0000000..26535bc
--- /dev/null
+++ b/tests/spec/gl-1.0/empty-begin-end-clause.c
@@ -0,0 +1,64 @@
+/*
+ * Copyright © 2009 VMWare
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+
+/*
+ * Test case from fdo bug #23489
+ * http://bugs.freedesktop.org/show_bug.cgi?id=23489
+ */
+
+#include "piglit-util-gl.h"
+
+PIGLIT_GL_TEST_CONFIG_BEGIN
+
+ config.supports_gl_compat_version = 10;
+
+ config.window_width = 250;
+ config.window_height = 250;
+ config.window_visual = PIGLIT_GL_VISUAL_RGB;
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
+
+PIGLIT_GL_TEST_CONFIG_END
+
+enum piglit_result
+piglit_display(void)
+{
+ int i;
+
+ for (i = 0; i < 100; i++) {
+ glBegin(GL_LINES);
+ glEnd();
+ }
+ glFlush();
+
+ return PIGLIT_PASS;
+}
+
+void
+piglit_init(int argc, char **argv)
+{
+ glClearColor(0.0, 0.0, 0.0, 0.0);
+ glMatrixMode(GL_PROJECTION);
+ glLoadIdentity();
+ glOrtho(0.0, 1.0, 0.0, 1.0, -1.0, 1.0);
+}
--
2.7.4
_______________________________________________
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit
