summaryrefslogtreecommitdiffstats
path: root/testApp.sh
diff options
context:
space:
mode:
authorJonathan Bauer2011-06-24 16:05:01 +0200
committerJonathan Bauer2011-06-24 16:05:01 +0200
commitec64ec206eb121e22fc601231a24cd77c50c659f (patch)
tree81a6b75a3b9e0d8574e3055433499ae617044acb /testApp.sh
parentremoved unneeded include (diff)
downloadfbgui-ec64ec206eb121e22fc601231a24cd77c50c659f.tar.gz
fbgui-ec64ec206eb121e22fc601231a24cd77c50c659f.tar.xz
fbgui-ec64ec206eb121e22fc601231a24cd77c50c659f.zip
minor changes
Diffstat (limited to 'testApp.sh')
-rwxr-xr-xtestApp.sh13
1 files changed, 4 insertions, 9 deletions
diff --git a/testApp.sh b/testApp.sh
index e1f1d1e..054169d 100755
--- a/testApp.sh
+++ b/testApp.sh
@@ -11,6 +11,7 @@
# -s <path>, --serial=<path> sets path to serial number file
#
# Note: all path are expected to be absolute.
+QT_VERSION=Qt-4.7.2
# clean /tmp/fbgui
rm -rf /tmp/fbgui
@@ -26,16 +27,10 @@ working_path=`dirname "$script_path"`
display_id=$(grep -n $(whoami) /etc/passwd| head -n 1|awk -F : '{print $1}')
# Start QT's virtual framebuffer with proper display_id
-/usr/local/Trolltech/Qt-4.7.2/bin/qvfb -width 1024 -height 768 -qwsdisplay :$display_id &
+/usr/local/Trolltech/$QT_VERSION/bin/qvfb -width 1024 -height 768 -qwsdisplay :$display_id &
# quick sleep to wait for qvfb loading
sleep 0.2
# Start fbgui connecting to QVFb with display_id from above.
$working_path/build/fbgui -display QVFb:$display_id $@
-# Check if fbbrowser is not running, if so kill the qvfb.
-if [ $(ps aux | grep -v grep | grep -c fbgui) -eq 1 ]
-then
- echo "fbgui is still running ..."
-else
- echo "fbgui stopped running, killing qvfb ..."
- killall qvfb
-fi
+# kill qvfb since fbgui stopped
+killall qvfb