From 1e58864230a5dc92615e62a018781503ea934455 Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Thu, 14 Apr 2016 11:36:18 +0200 Subject: [PATCH] Revert unwanted change of hello.odt, and prevent that from happening again. --- loolwsd/.gitignore | 1 + loolwsd/Makefile.am | 3 ++- loolwsd/test/data/hello.odt | Bin 8802 -> 8965 bytes 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/loolwsd/.gitignore b/loolwsd/.gitignore index 208aef8e3..2bc08f05c 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 ccd729b74..2afdd8f21 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@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 3febe62f522b8de5af8bcc8ab66d1d597a78760e..fcd047a2bb2a667645c26d134fda9aa313467d18 100644 GIT binary patch delta 4189 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