summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2012-11-02 10:42:59 -0600
committerBrian Paul <brianp@vmware.com>2012-11-06 16:12:37 -0700
commit3a76d1432e0e57ad2cc86b4807e218aaaa953f8f (patch)
treef6bf1664eefae16b9b4990519d5b848ed3211297
parent6fb30c7cd2075a034eaed1273574b99667219426 (diff)
util/gl: add default window config of 150 x 150 pixels
On Win7 windows get resized to the min size of 116x100 pixels (which might depend on the Aero theme, etc). This resize is detected by the piglit framework: Got spurious window resize in automatic run (100,100 to 116,100) PIGLIT: {'result': 'warn'} so we get a 'warn' result instead of actually running the test. This sets a default window size of 150x150 pixels. Next, we'll remove the "config.window_width/height = 100" lines from a bunch of tests. Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
-rw-r--r--tests/util/piglit-framework-gl.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/util/piglit-framework-gl.h b/tests/util/piglit-framework-gl.h
index d1b8e674..4dd60ded 100644
--- a/tests/util/piglit-framework-gl.h
+++ b/tests/util/piglit-framework-gl.h
@@ -224,6 +224,14 @@ piglit_gl_test_run(int argc, char *argv[],
\
config.init = piglit_init; \
config.display = piglit_display; \
+ \
+ /* Default window size. Note: Win7's min window width */ \
+ /* seems to be 116 pixels. When the window size is */ \
+ /* unexpectedly resized, tests are marked as "WARN". */ \
+ /* Let's use a larger default to avoid that. */ \
+ config.window_width = 150; \
+ config.window_height = 150;
+
#define PIGLIT_GL_TEST_CONFIG_END \
\