[Piglit] [PATCH 6/6] Set rlimit on glsl-*-explosion.shader_test, remove from blacklist

Ian Romanick idr at freedesktop.org
Wed Jul 27 17:50:49 PDT 2011


From: Ian Romanick <ian.d.romanick at intel.com>

Setting the rlimit should prevent the tests from completely exhausting
system memory and swap.  Since the tests are more system friendly,
they are removed from the blacklist.
---
 tests/all.tests                                    |    4 ----
 tests/shaders/glsl-fs-inline-explosion.shader_test |    1 +
 tests/shaders/glsl-fs-unroll-explosion.shader_test |    1 +
 tests/shaders/glsl-vs-inline-explosion.shader_test |    1 +
 tests/shaders/glsl-vs-unroll-explosion.shader_test |    1 +
 5 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/all.tests b/tests/all.tests
index 2aeacab..7af5c09 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -14,10 +14,6 @@ from framework.glsl_parser_test import GLSLParserTest, add_glsl_parser_test, imp
 
 # Blacklisted tests are removed from the test profile.
 blacklist = [
-	'shaders/glsl-fs-unroll-explosion',
-	'shaders/glsl-fs-inline-explosion',
-	'shaders/glsl-vs-unroll-explosion',
-	'shaders/glsl-vs-inline-explosion',
 	]
 
 ######
diff --git a/tests/shaders/glsl-fs-inline-explosion.shader_test b/tests/shaders/glsl-fs-inline-explosion.shader_test
index 144a98a..a82a894 100644
--- a/tests/shaders/glsl-fs-inline-explosion.shader_test
+++ b/tests/shaders/glsl-fs-inline-explosion.shader_test
@@ -1,6 +1,7 @@
 // if you inline all functions indiscriminately, you won't pass this
 [require]
 GLSL >= 1.10
+rlimit 268435456
 
 [vertex shader]
 void main()
diff --git a/tests/shaders/glsl-fs-unroll-explosion.shader_test b/tests/shaders/glsl-fs-unroll-explosion.shader_test
index dffd384..b996efb 100644
--- a/tests/shaders/glsl-fs-unroll-explosion.shader_test
+++ b/tests/shaders/glsl-fs-unroll-explosion.shader_test
@@ -1,6 +1,7 @@
 // if you unroll all loops with a few iterations, you won't pass this
 [require]
 GLSL >= 1.10
+rlimit 268435456
 
 [vertex shader]
 void main()
diff --git a/tests/shaders/glsl-vs-inline-explosion.shader_test b/tests/shaders/glsl-vs-inline-explosion.shader_test
index 791f8ed..e08d3d5 100644
--- a/tests/shaders/glsl-vs-inline-explosion.shader_test
+++ b/tests/shaders/glsl-vs-inline-explosion.shader_test
@@ -1,6 +1,7 @@
 // if you inline all functions indiscriminately, you won't pass this
 [require]
 GLSL >= 1.10
+rlimit 268435456
 
 [vertex shader]
 void f64()
diff --git a/tests/shaders/glsl-vs-unroll-explosion.shader_test b/tests/shaders/glsl-vs-unroll-explosion.shader_test
index da8a879..91e2b43 100644
--- a/tests/shaders/glsl-vs-unroll-explosion.shader_test
+++ b/tests/shaders/glsl-vs-unroll-explosion.shader_test
@@ -1,6 +1,7 @@
 // if you inline all functions indiscriminately, you won't pass this
 [require]
 GLSL >= 1.10
+rlimit 268435456
 
 [vertex shader]
 
-- 
1.7.4.4



More information about the Piglit mailing list