diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2011-07-27 17:39:24 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2011-08-19 09:24:59 -0700 |
| commit | 01dff3f8338e17665b036d849e0fdf2c96348325 (patch) | |
| tree | 4e956da8d4e5327e2584bfdd9796cfda396cba0e | |
| parent | c4b2de91e1dcec1c5ccd154eeb8d9da081f3f319 (diff) | |
Set rlimit on glsl-*-explosion.shader_test, remove from blacklist
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.
Acked-by: José Fonseca <jfonseca@vmware.com>
| -rw-r--r-- | tests/all.tests | 4 | ||||
| -rw-r--r-- | tests/shaders/glsl-fs-inline-explosion.shader_test | 1 | ||||
| -rw-r--r-- | tests/shaders/glsl-fs-unroll-explosion.shader_test | 1 | ||||
| -rw-r--r-- | tests/shaders/glsl-vs-inline-explosion.shader_test | 1 | ||||
| -rw-r--r-- | 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 701e7020..406d23f1 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', ] # Find the generated_tests directory, by looking either in diff --git a/tests/shaders/glsl-fs-inline-explosion.shader_test b/tests/shaders/glsl-fs-inline-explosion.shader_test index 144a98a7..a82a8943 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 dffd3840..b996efba 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 791f8ede..e08d3d5f 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 da8a879f..91e2b43a 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] |