diff options
| author | Quentin Glidic <sardemff7+git@sardemff7.net> | 2017-05-28 00:43:46 +0200 |
|---|---|---|
| committer | Quentin Glidic <sardemff7+git@sardemff7.net> | 2017-05-28 00:43:46 +0200 |
| commit | 0afe4d237dd5ca92d08211fbf78975910cedbf0a (patch) | |
| tree | d0c3eccbba4b8a7d0f69027a374a305a444fb505 /test | |
| parent | cfede32f7cb78a9ca0dd0a84f54048103f4718f3 (diff) | |
test-x: Keep server and fluxbox logs out of the way
Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Diffstat (limited to 'test')
| -rwxr-xr-x | test/run_all_tests.sh | 1 | ||||
| -rwxr-xr-x | test/run_test.sh | 9 |
2 files changed, 5 insertions, 5 deletions
diff --git a/test/run_all_tests.sh b/test/run_all_tests.sh index 6625c6da..6b039c65 100755 --- a/test/run_all_tests.sh +++ b/test/run_all_tests.sh @@ -26,6 +26,7 @@ tests=( ) cd ${MESON_BUILD_ROOT} +mkdir -p test-x-logs rm -f core display=200 diff --git a/test/run_test.sh b/test/run_test.sh index ecee0ed0..a41de6a8 100755 --- a/test/run_test.sh +++ b/test/run_test.sh @@ -6,10 +6,10 @@ function create_fake_x ( ) { export DISPLAY=":$1" echo "Starting fake X: ${DISPLAY}" - Xvfb +extension XINERAMA +xinerama -screen 0 1280x1024x24 -screen 1 800x600x24 ${DISPLAY} & + Xvfb +extension XINERAMA +xinerama -screen 0 1280x1024x24 -screen 1 800x600x24 ${DISPLAY} &>test-x-logs/xserver-:$1.log & XPID=$! sleep 1; - timeout -k 30s 30s fluxbox & + timeout -k 30s 30s fluxbox &>test-x-logs/fluxbox-:$1.log & FPID=$! sleep 1 } @@ -28,14 +28,13 @@ function destroy_fake_x ( ) fi } -if [ -n "$3" ] +if [ -n "$3" ] then export PATH=$3:$PATH fi create_fake_x "$1" -echo "$DISPLAY" -$2 $4 +"$2" "$4" RES=$? destroy_fake_x |