diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2013-06-09 20:25:14 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2013-06-09 20:25:14 (GMT) |
| commit | 5268638ffe938bde0c1b7d55907f14ac7f29f9ea (patch) | |
| tree | 091fae6edd30d28587ce6ce9d093889b29337228 | |
| parent | 3302442b971e9fa46d50d19913e0ed316dff7ebd (diff) | |
better solution for xvfb startup on netbsd/ash
| -rwxr-xr-x | scripts/uni-get-dependencies.sh | 2 | ||||
| -rwxr-xr-x | tests/virtualfb.sh | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/scripts/uni-get-dependencies.sh b/scripts/uni-get-dependencies.sh index b3c6881..31337c8 100755 --- a/scripts/uni-get-dependencies.sh +++ b/scripts/uni-get-dependencies.sh @@ -50,7 +50,7 @@ get_mageia_deps() sudo urpmi ctags sudo urpmi task-c-devel task-c++-devel libqt4-devel libgmp-devel \ libmpfr-devel libboost-devel eigen3-devel libglew-devel bison flex \ - cmake imagemagick python curl git + cmake imagemagick python curl git x11-server-xvfb } get_debian_deps() diff --git a/tests/virtualfb.sh b/tests/virtualfb.sh index 252da98..c5c9668 100755 --- a/tests/virtualfb.sh +++ b/tests/virtualfb.sh @@ -24,15 +24,11 @@ start() fi VFB_DISPLAY=`echo | awk 'BEGIN{srand();} {printf ":%.0f", rand()*1000+100};'` - if [ $debug ]; then + if [ $debug ]; then echo debug VFB_DISPLAY $VFB_DISPLAY echo debug VFB_BINARY $VFB_BINARY fi - if [ $BASH ]; then - $VFB_BINARY $VFB_DISPLAY -screen 0 800x600x24 \&> ./virtualfb.log & - else - $VFB_BINARY $VFB_DISPLAY -screen 0 800x600x24 > ./virtualfb.log & - fi + $VFB_BINARY $VFB_DISPLAY -screen 0 800x600x24 > ./virtualfb1.log 2> ./virtualfb2.log & # on some systems $! gives us VFB_BINARY's PID, on others we have to subtract 1 VFB_PID_MINUS0=$! VFB_PID_MINUS1=$(($VFB_PID_MINUS0 - 1)) |