now run-tests.py deals with Xvfb instead of scripts inside fwbuilder module

This commit is contained in:
Vadim Kurland
2010-04-19 19:47:31 +00:00
parent f778743b89
commit c88c5d726b
3 changed files with 3 additions and 19 deletions
+1 -1
View File
@@ -1 +1 @@
#define BUILD_NUM 2811
#define BUILD_NUM 2822
+1 -12
View File
@@ -2,22 +2,11 @@
commands=$@
for directory in `find . -maxdepth 1 -type d -regex '\./[A-Za-z0-9\-\_]*'`
do
cd $directory
[ ! -e Makefile ] && qmake -spec $QMAKESPEC
PID=""
[ -z "$DISPLAY" ] && {
Xvfb :1 &
PID=$!
export DISPLAY=":1"
}
$commands; TEST_STATUS=$?
[ -n "$PID" ] && kill $PID
[ $TEST_STATUS ] || exit 0
$commands || exit 1
cd -
done
+1 -6
View File
@@ -2,16 +2,11 @@
commands=$@
Xvfb :1 &
PID=$!
export DISPLAY=":1"
for directory in `find . -maxdepth 1 -type d -regex '\./[A-Za-z0-9\-\_]*'`
do
cd $directory
[ ! -e Makefile ] && qmake -spec $QMAKESPEC
$commands || { kill $PID; exit 1; }
$commands || exit 1;
cd -
done
kill $PID || exit 0