From 9e531888ed0c3e34303a67e324ea4ab29057c62b Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Thu, 22 Mar 2012 12:27:43 +0100 Subject: [PATCH] tests: don't just bail out when there's not enough RAM ... but actually run the test with reduced memory requirements, as the messages claims. Additional print it to stdout, stderr seems to imply FAIL in our QA's testing rig. Signed-off-by: Daniel Vetter --- tests/gem_linear_blits.c | 3 +-- tests/gem_tiled_blits.c | 3 +-- tests/gem_tiled_fence_blits.c | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/tests/gem_linear_blits.c b/tests/gem_linear_blits.c index 86c4a638..ec2ba269 100644 --- a/tests/gem_linear_blits.c +++ b/tests/gem_linear_blits.c @@ -191,8 +191,7 @@ int main(int argc, char **argv) if (count > intel_get_total_ram_mb() * 9 / 10) { count = intel_get_total_ram_mb() * 9 / 10; - fprintf(stderr, "not enough RAM to run test, reducing buffer count\n"); - return 77; + printf("not enough RAM to run test, reducing buffer count\n"); } printf("Using %d 1MiB buffers\n", count); diff --git a/tests/gem_tiled_blits.c b/tests/gem_tiled_blits.c index 635027da..86c9a886 100644 --- a/tests/gem_tiled_blits.c +++ b/tests/gem_tiled_blits.c @@ -137,8 +137,7 @@ int main(int argc, char **argv) if (count > intel_get_total_ram_mb() * 9 / 10) { count = intel_get_total_ram_mb() * 9 / 10; - fprintf(stderr, "not enough RAM to run test, reducing buffer count\n"); - return 77; + printf("not enough RAM to run test, reducing buffer count\n"); } printf("Using %d 1MiB buffers\n", count); diff --git a/tests/gem_tiled_fence_blits.c b/tests/gem_tiled_fence_blits.c index 9cc8e046..dc654793 100644 --- a/tests/gem_tiled_fence_blits.c +++ b/tests/gem_tiled_fence_blits.c @@ -112,8 +112,7 @@ int main(int argc, char **argv) count = 3 * gem_aperture_size(fd) / (1024*1024) / 2; if (count > intel_get_total_ram_mb() * 9 / 10) { count = intel_get_total_ram_mb() * 9 / 10; - fprintf(stderr, "not enough RAM to run test, reducing buffer count\n"); - return 77; + printf("not enough RAM to run test, reducing buffer count\n"); } count |= 1; printf("Using %d 1MiB buffers\n", count);