summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon TURNEY <jon.turney@dronecode.org.uk>2010-09-16 18:36:22 +0100
committerJon TURNEY <jon.turney@dronecode.org.uk>2010-09-16 18:36:22 +0100
commitfcf2923352d3438d026503efc1766d0b98cf3865 (patch)
tree2e6c2a8d31c6bf44317917a73bb6470a4b5e7b84
parenta5451626faf7ee3f02adf5baf9d524c7afa47265 (diff)
Make sure glean.log file exists to avoid error if glean-wrapper fails to start for some reason
Log the opengl renderer details as well
-rwxr-xr-xglean-test.sh2
-rwxr-xr-xglean-wrapper4
2 files changed, 4 insertions, 2 deletions
diff --git a/glean-test.sh b/glean-test.sh
index c2dda15..211262d 100755
--- a/glean-test.sh
+++ b/glean-test.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-rm /tmp/glean.log
+echo >/tmp/glean.log
xinit `pwd`/glean-wrapper -- :99 -multiwindow >/tmp/startx.log 2>&1
cat /tmp/glean.log
PASS=`grep -c "PASS " /tmp/glean.log`
diff --git a/glean-wrapper b/glean-wrapper
index 91efc6f..15dbd4b 100755
--- a/glean-wrapper
+++ b/glean-wrapper
@@ -1,4 +1,6 @@
#!/bin/sh
-echo glean -r tinderbox -o --quick >/tmp/glean.log
+glxinfo | grep -E "OpenGL [[:alpha:]]* string" >/tmp/glean.log
+glxinfo | grep -E "direct" >>/tmp/glean.log
+echo glean -r tinderbox -o --quick >>/tmp/glean.log
$JHBUILD_CHECKOUTROOT/glean/bin/glean -r tinderbox -o --quick >>/tmp/glean.log 2>&1
# run again with LIBGL_ALWAYS_INDIRECT=1 ?