[Piglit] [PATCH 17/20] Move fdo31934 test from bugs to spec dir.

Fabian Bieler fabianbieler at fastmail.fm
Sat Dec 16 19:21:17 UTC 2017


Now it's called "map-empty".
---
 tests/all.py                                       |  2 +-
 tests/bugs/CMakeLists.gl.txt                       |  1 -
 tests/bugs/fdo31934.c                              | 40 -------------
 .../arb_vertex_buffer_object/CMakeLists.gl.txt     |  1 +
 tests/spec/arb_vertex_buffer_object/map-empty.c    | 68 ++++++++++++++++++++++
 5 files changed, 70 insertions(+), 42 deletions(-)
 delete mode 100644 tests/bugs/fdo31934.c
 create mode 100644 tests/spec/arb_vertex_buffer_object/map-empty.c

diff --git a/tests/all.py b/tests/all.py
index 9a90fe9..38ecaf5 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -2726,7 +2726,7 @@ with profile.test_list.group_manager(
       'mixed-immediate-and-vbo')
     g(['arb_vertex_buffer_object-delete-mapped-buffer'])
     g(['arb_vertex_buffer_object-map-after-draw'])
-    g(['fdo31934'])
+    g(['arb_vertex_buffer_object-map-empty'])
     g(['arb_vertex_buffer_object-ib-data-sync'], 'ib-data-sync')
     g(['arb_vertex_buffer_object-ib-subdata-sync'], 'ib-subdata-sync')
     g(['pos-array'])
diff --git a/tests/bugs/CMakeLists.gl.txt b/tests/bugs/CMakeLists.gl.txt
index faf0dbf..69005bd 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 (fdo31934 fdo31934.c)
 piglit_add_executable (tri-tex-crash tri-tex-crash.c)
 piglit_add_executable (vbo-buffer-unmap vbo-buffer-unmap.c)
 
diff --git a/tests/bugs/fdo31934.c b/tests/bugs/fdo31934.c
deleted file mode 100644
index 86bbb73..0000000
--- a/tests/bugs/fdo31934.c
+++ /dev/null
@@ -1,40 +0,0 @@
-#include "piglit-util-gl.h"
-
-PIGLIT_GL_TEST_CONFIG_BEGIN
-
-	config.supports_gl_compat_version = 10;
-
-	config.window_width = 512;
-	config.window_height = 512;
-	config.window_visual = PIGLIT_GL_VISUAL_RGB;
-	config.khr_no_error_support = PIGLIT_NO_ERRORS;
-
-PIGLIT_GL_TEST_CONFIG_END
-
-void
-piglit_init(int argc, char *argv[])
-{
-    GLuint id;
-
-    piglit_require_gl_version(15);
-
-    piglit_require_extension("GL_ARB_vertex_buffer_object");
-
-    glGenBuffersARB(1, &id);
-    glBindBufferARB(GL_ARRAY_BUFFER_ARB, id);
-    glBufferDataARB(GL_ARRAY_BUFFER_ARB, 0, NULL, GL_STATIC_DRAW);
-    glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
-
-    glBindBufferARB(GL_ARRAY_BUFFER_ARB, id);
-    glMapBuffer(GL_ARRAY_BUFFER_ARB, GL_READ_WRITE_ARB); /* CRASH! */
-    glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
-
-    piglit_report_result(PIGLIT_PASS);
-}
-
-enum piglit_result
-piglit_display(void)
-{
-	/* Should never be reached */
-	return PIGLIT_FAIL;
-}
diff --git a/tests/spec/arb_vertex_buffer_object/CMakeLists.gl.txt b/tests/spec/arb_vertex_buffer_object/CMakeLists.gl.txt
index d671b67..0d44d3e 100644
--- a/tests/spec/arb_vertex_buffer_object/CMakeLists.gl.txt
+++ b/tests/spec/arb_vertex_buffer_object/CMakeLists.gl.txt
@@ -12,6 +12,7 @@ piglit_add_executable (arb_vertex_buffer_object-combined-vertex-index combined-v
 piglit_add_executable (arb_vertex_buffer_object-delete-mapped-buffer delete-mapped-buffer.c)
 piglit_add_executable (arb_vertex_buffer_object-elements-negative-offset elements-negative-offset.c)
 piglit_add_executable (arb_vertex_buffer_object-map-after-draw map-after-draw.c)
+piglit_add_executable (arb_vertex_buffer_object-map-empty map-empty.c)
 piglit_add_executable (arb_vertex_buffer_object-mixed-immediate-and-vbo mixed-immediate-and-vbo.c)
 piglit_add_executable (arb_vertex_buffer_object-ib-data-sync ib-data-sync.c)
 piglit_add_executable (arb_vertex_buffer_object-ib-subdata-sync ib-subdata-sync.c)
diff --git a/tests/spec/arb_vertex_buffer_object/map-empty.c b/tests/spec/arb_vertex_buffer_object/map-empty.c
new file mode 100644
index 0000000..83e5160
--- /dev/null
+++ b/tests/spec/arb_vertex_buffer_object/map-empty.c
@@ -0,0 +1,68 @@
+/*
+ * Copyright © 2010 Wiktor Janas
+ *
+ * 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.
+ */
+
+/*
+ * Map empty vbo.
+ *
+ * https://bugs.freedesktop.org/show_bug.cgi?id=31934
+ */
+#include "piglit-util-gl.h"
+
+PIGLIT_GL_TEST_CONFIG_BEGIN
+
+	config.supports_gl_compat_version = 10;
+
+	config.window_width = 512;
+	config.window_height = 512;
+	config.window_visual = PIGLIT_GL_VISUAL_RGB;
+	config.khr_no_error_support = PIGLIT_NO_ERRORS;
+
+PIGLIT_GL_TEST_CONFIG_END
+
+void
+piglit_init(int argc, char *argv[])
+{
+    GLuint id;
+
+    piglit_require_gl_version(15);
+
+    piglit_require_extension("GL_ARB_vertex_buffer_object");
+
+    glGenBuffersARB(1, &id);
+    glBindBufferARB(GL_ARRAY_BUFFER_ARB, id);
+    glBufferDataARB(GL_ARRAY_BUFFER_ARB, 0, NULL, GL_STATIC_DRAW);
+    glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
+
+    glBindBufferARB(GL_ARRAY_BUFFER_ARB, id);
+    glMapBuffer(GL_ARRAY_BUFFER_ARB, GL_READ_WRITE_ARB); /* CRASH! */
+    glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
+
+    piglit_report_result(PIGLIT_PASS);
+}
+
+enum piglit_result
+piglit_display(void)
+{
+	/* Should never be reached */
+	return PIGLIT_FAIL;
+}
-- 
2.7.4



More information about the Piglit mailing list