[Libreoffice-commits] online.git: loolwsd/Makefile.am

[Andras Timar]

 loolwsd/Makefile.am |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 6620502229008da9fe8c3989886c61781e52552d
Author: Andras Timar <andras.timar at collabora.com>
Date:   Mon Jun 27 09:45:29 2016 +0200

    loolwsd: fix run_valgrind target with new command line options

diff --git a/loolwsd/Makefile.am b/loolwsd/Makefile.am
index cf4a37d..5546181 100644
--- a/loolwsd/Makefile.am
+++ b/loolwsd/Makefile.am
@@ -150,8 +150,9 @@ run: all @JAILS_PATH@ @SYSTEMPLATE_PATH@/system_stamp
 run_valgrind: all @JAILS_PATH@ @SYSTEMPLATE_PATH@/system_stamp
 	@echo "Launching loolwsd under valgrind (but not forkit/loolkit, yet)"
 	valgrind --tool=memcheck --trace-children=no -v --read-var-info=yes \
-		./loolwsd --systemplate="@SYSTEMPLATE_PATH@" --lotemplate="@LO_PATH@" \
-                  --childroot="@JAILS_PATH@" --allowlocalstorage --admincreds=admin/admin
+		./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:admin_console.username=admin --o:admin_console.password=admin
 else
 
 SYSTEM_STAMP =