loolwsd/test/run_unit.sh.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 030b59a5af9d6cbbaf5698a74d99519aeee4a4ad
Author: Jan Holesovsky <ke...@collabora.com>
Date: Tue May 3 14:51:40 2016 +0200
Redirect stdout to the log too.
Without this, the unit-prefork gives unpredictable results depending on
whether the entire unit test run output is redirected to another logfile or
not (as then the stdout is inherited, and points to an unexpected place).
Maybe we should just exclude the fd 0, 1, 2 from the testing; but this is
good
enough for now.
diff --git a/loolwsd/test/run_unit.sh.in b/loolwsd/test/run_unit.sh.in
index f91bb80..7b25c4a 100755
--- a/loolwsd/test/run_unit.sh.in
+++ b/loolwsd/test/run_unit.sh.in
@@ -73,7 +73,7 @@ else # newer unit tests.
--childroot="$jails_path" \
--allowlocalstorage \
--admincreds="admin/admin" \
- --unitlib=".libs/$tst.so" 2> "$tst_log";
then
+ --unitlib=".libs/$tst.so" > "$tst_log"
2>&1; then
echo "Test $tst passed."
echo ":test-result: PASS $tst" >> $test_output
else
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
