From 88838185917f29aba2273b5081ddd4e8803103b1 Mon Sep 17 00:00:00 2001 From: Pekka Paalanen Date: Wed, 12 Dec 2012 14:26:38 +0200 Subject: [PATCH] tests: write logs to files This cleans up the 'make check' output considerably. When all goes well, you will only see the "PASS" line for each of $TESTS. Weston logs into a separate file than stdout and stderr, so server logs end up in one file per test, and other output to another file per test. 'make distclean' does not remove the tests/logs/ directory. Also changes the weston-tests-env interpreter to bash, since I think &> and ${1/.la/.so} might be bashisms. --- tests/.gitignore | 1 + tests/weston-tests-env | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/tests/.gitignore b/tests/.gitignore index 4c6b430c1..166a6d454 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -1,3 +1,4 @@ +logs matrix-test setbacklight test-client diff --git a/tests/weston-tests-env b/tests/weston-tests-env index 1f8281fc7..9a0e632dc 100755 --- a/tests/weston-tests-env +++ b/tests/weston-tests-env @@ -1,12 +1,24 @@ -#!/bin/sh +#!/bin/bash WESTON=$abs_builddir/../src/weston +LOGDIR=$abs_builddir/logs + +mkdir -p "$LOGDIR" + +SERVERLOG="$LOGDIR/$1-serverlog.txt" +OUTLOG="$LOGDIR/$1-log.txt" + +rm -f "$SERVERLOG" case $1 in *.la|*.so) - $WESTON --modules=$abs_builddir/.libs/${1/.la/.so} + $WESTON --modules=$abs_builddir/.libs/${1/.la/.so} \ + --log="$SERVERLOG" \ + &> "$OUTLOG" ;; *) WESTON_TEST_CLIENT_PATH=$abs_builddir/$1 $WESTON \ - --modules=$abs_builddir/.libs/weston-test.so + --log="$SERVERLOG" \ + --modules=$abs_builddir/.libs/weston-test.so \ + &> "$OUTLOG" esac