[Piglit] [PATCH 3/3] CorrectPreprocess11: Remove from tree.
jfonseca at vmware.com
jfonseca at vmware.com
Wed Jun 26 02:48:49 PDT 2013
From: José Fonseca <jfonseca at vmware.com>
So that we don't have to go out of our way to remove it later.
(We could also rename it if there is still some value in it.)
---
tests/all.tests | 1 -
.../shaders/CorrectPreprocess11.frag | 68 ----------------------
tests/gpu.tests | 7 +--
3 files changed, 1 insertion(+), 75 deletions(-)
delete mode 100644 tests/glslparsertest/shaders/CorrectPreprocess11.frag
diff --git a/tests/all.tests b/tests/all.tests
index c8ff942..df3c676 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -2355,7 +2355,6 @@ for filename in os.listdir(testsDir + '/glslparsertest/shaders'):
ext = filename.rsplit('.')[-1]
if ext in ['vert', 'geo', 'frag']:
add_glsl_parser_test(glslparsertest, path.join(testsDir, 'glslparsertest/shaders', filename), filename)
-del glslparsertest['CorrectPreprocess11.frag']
for filename in os.listdir(testsDir + '/glslparsertest/glsl2'):
ext = filename.rsplit('.')[-1]
if ext in ['vert', 'geo', 'frag']:
diff --git a/tests/glslparsertest/shaders/CorrectPreprocess11.frag b/tests/glslparsertest/shaders/CorrectPreprocess11.frag
deleted file mode 100644
index 86eb1c5..0000000
--- a/tests/glslparsertest/shaders/CorrectPreprocess11.frag
+++ /dev/null
@@ -1,68 +0,0 @@
-#if 0
-
-#define f 1.2
-
-#elif 1
-
-#define f 1.4
-
-#endif
-
-
-
-#if 2
-
-#define q 8.9
-
-#endif
-
-
-
-
-#if 0
-these tokens will be ignored
-
-#else tokens to be ignored
-#define f 4.5
-
-#endif
-
-
-
-#if 1
-
-#else
-
-#endif
-
-
-
-#define pine
-
-
-#ifdef pine please raise a warning
-
-#else
-
-#endif
-
-
-
-#ifndef pine
-
-ignore these tokens too
-
-#elif 1
-#define f 3.4
-
-#endif
-
-
-
-void main()
-
-{
-
- gl_FragColor = vec4(f);
-
-}
diff --git a/tests/gpu.tests b/tests/gpu.tests
index 71cd657..3009a08 100644
--- a/tests/gpu.tests
+++ b/tests/gpu.tests
@@ -10,12 +10,7 @@ global profile
# Filter out any GLSLParserTest instances, as they're compiler tests.
def add_glsl_parser_test(group, filepath, test_name):
# Dummy version of framework.glsl_parser_test.add_glsl_parser_test
- if test_name == 'CorrectPreprocess11.frag':
- # all.tests expects CorrectPreprocess11.frag to exists
- group[test_name] = GLSLParserTest(filepath)
- else:
- # Ignore
- pass
+ pass
# This be done before executing the base test list script
framework.glsl_parser_test.add_glsl_parser_test = add_glsl_parser_test
--
1.8.1.2
More information about the Piglit
mailing list