Makefile.am | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 66a76f644bde3aa21f9de4e095be8c8300cbf021
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date: Mon Apr 3 21:05:36 2017 -0400
wsd: enable logging with valgrind
Change-Id: I411f7de3d5764cd25af211f2dc77bf0e290adbc7
Reviewed-on: https://gerrit.libreoffice.org/36054
Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
Tested-by: Ashod Nakashian <ashnak...@gmail.com>
diff --git a/Makefile.am b/Makefile.am
index 76f1dc8d..a438ff7d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -226,27 +226,32 @@ run: all @JAILS_PATH@ @SYSTEMPLATE_PATH@/system_stamp
--o:ssl.cert_file_path="$(abs_top_srcdir)/etc/cert.pem" \
--o:ssl.key_file_path="$(abs_top_srcdir)/etc/key.pem"
\
--o:ssl.ca_file_path="$(abs_top_srcdir)/etc/ca-chain.cert.pem" \
- --o:admin_console.username=admin
--o:admin_console.password=admin
+ --o:admin_console.username=admin
--o:admin_console.password=admin \
+ --o:logging.file[@enable]=false
--o:logging.level=trace
run-valgrind: all @JAILS_PATH@ @SYSTEMPLATE_PATH@/system_stamp
@echo "Launching loolwsd under valgrind (but not forkit/loolkit, yet)"
+ @cp $(abs_top_srcdir)/test/data/hello.odt
$(abs_top_srcdir)/test/data/hello-world.odt
valgrind --tool=memcheck --trace-children=no -v --read-var-info=yes \
./loolwsd --o:sys_template_path="@SYSTEMPLATE_PATH@"
--o:lo_template_path="@LO_PATH@" \
--o:child_root_path="@JAILS_PATH@"
--o:storage.filesystem[@allow]=true \
--o:ssl.cert_file_path="$(abs_top_srcdir)/etc/cert.pem" \
--o:ssl.key_file_path="$(abs_top_srcdir)/etc/key.pem"
\
--o:ssl.ca_file_path="$(abs_top_srcdir)/etc/ca-chain.cert.pem" \
- --o:admin_console.username=admin
--o:admin_console.password=admin
+ --o:admin_console.username=admin
--o:admin_console.password=admin \
+ --o:logging.file[@enable]=false
--o:logging.level=trace
run-callgrind: all @JAILS_PATH@ @SYSTEMPLATE_PATH@/system_stamp
@echo "Launching loolwsd under valgrind (but not forkit/loolkit, yet)"
+ @cp $(abs_top_srcdir)/test/data/hello.odt
$(abs_top_srcdir)/test/data/hello-world.odt
valgrind --tool=callgrind --simulate-cache=yes --dump-instr=yes
--num-callers=50 --error-limit=no \
./loolwsd --o:sys_template_path="@SYSTEMPLATE_PATH@"
--o:lo_template_path="@LO_PATH@" \
--o:child_root_path="@JAILS_PATH@"
--o:storage.filesystem[@allow]=true \
--o:ssl.cert_file_path="$(abs_top_srcdir)/etc/cert.pem" \
--o:ssl.key_file_path="$(abs_top_srcdir)/etc/key.pem"
\
--o:ssl.ca_file_path="$(abs_top_srcdir)/etc/ca-chain.cert.pem" \
- --o:admin_console.username=admin
--o:admin_console.password=admin
+ --o:admin_console.username=admin
--o:admin_console.password=admin \
+ --o:logging.file[@enable]=false
--o:logging.level=trace
else
SYSTEM_STAMP =
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
