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

[Jan Holesovsky]

 loolwsd/.gitignore          |    1 +
 loolwsd/Makefile.am         |    3 ++-
 loolwsd/test/data/hello.odt |binary
 3 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 1e58864230a5dc92615e62a018781503ea934455
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Thu Apr 14 11:36:18 2016 +0200

    Revert unwanted change of hello.odt, and prevent that from happening again.

diff --git a/loolwsd/.gitignore b/loolwsd/.gitignore
index 208aef8..2bc08f0 100644
--- a/loolwsd/.gitignore
+++ b/loolwsd/.gitignore
@@ -29,6 +29,7 @@ m4
 systemplate
 test-driver
 jails
+test/data/hello-world.odt
 
 *.o
 *.exe
diff --git a/loolwsd/Makefile.am b/loolwsd/Makefile.am
index ccd729b..2afdd8f 100644
--- a/loolwsd/Makefile.am
+++ b/loolwsd/Makefile.am
@@ -105,8 +105,9 @@ clean-local:
 
 run: @JAILS_PATH@ @SYSTEMPLATE_PATH@/system_stamp
 	@echo "Launching loolwsd - launch this in your browser:"
+	@cp $(abs_top_srcdir)/test/data/hello.odt $(abs_top_srcdir)/test/data/hello-world.odt
 	@PROTOCOL="http" ; if test "z at ENABLE_SSL@" != "z"; then PROTOCOL="https" ; fi ; \
-		echo "   $$PROTOCOL://localhost:9980/loleaflet/dist/loleaflet.html?file_path=file://$(abs_top_srcdir)/test/data/hello.odt"
+		echo "   $$PROTOCOL://localhost:9980/loleaflet/dist/loleaflet.html?file_path=file://$(abs_top_srcdir)/test/data/hello-world.odt"
 	@echo
 	./loolwsd --systemplate="@SYSTEMPLATE_PATH@" --lotemplate="@LO_PATH@" \
                   --childroot="@JAILS_PATH@" --allowlocalstorage
diff --git a/loolwsd/test/data/hello.odt b/loolwsd/test/data/hello.odt
index 3febe62..fcd047a 100644
Binary files a/loolwsd/test/data/hello.odt and b/loolwsd/test/data/hello.odt differ