[PATCH weston 1/4] tests: write logs to files

Pekka Paalanen ppaalanen at gmail.com
Wed Dec 12 04:26:38 PST 2012


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 4c6b430..166a6d4 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 1f8281f..9a0e632 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
-- 
1.7.8.6



More information about the wayland-devel mailing list