[Libreoffice-commits] online.git: 2 commits - Makefile.am test/data

[Libreoffice Gerrit user]

 Makefile.am         |   10 ++++++++++
 dev/null            |binary
 test/data/hello.odp |binary
 test/data/hello.ods |binary
 4 files changed, 10 insertions(+)

New commits:
commit c50cd3b550a2143a4b88583da92a6006b247116c
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu Nov 1 11:29:23 2018 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Nov 1 11:39:43 2018 +0100

    take hello-world.ods and hello-world.odp out of version control
    
    Change-Id: I108e1a0e0981a50f35c7637f00fa15f8cf9d33c3
    Reviewed-on: https://gerrit.libreoffice.org/62725
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/Makefile.am b/Makefile.am
index 3451489ae..50b9bf0ab 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -281,6 +281,8 @@ run: all @TILECACHE_PATH@ @JAILS_PATH@
 	@echo "Launching loolwsd"
 	@fc-cache "@LO_PATH@"/share/fonts/truetype
 	@cp $(abs_top_srcdir)/test/data/hello.odt $(abs_top_srcdir)/test/data/hello-world.odt
+	@cp $(abs_top_srcdir)/test/data/hello.ods $(abs_top_srcdir)/test/data/hello-world.ods
+	@cp $(abs_top_srcdir)/test/data/hello.odp $(abs_top_srcdir)/test/data/hello-world.odp
 	@echo
 	./loolwsd --o:sys_template_path="@SYSTEMPLATE_PATH@" --o:lo_template_path="@LO_PATH@" \
 			  --o:child_root_path="@JAILS_PATH@" --o:storage.filesystem[@allow]=true \
@@ -295,6 +297,8 @@ run-valgrind: all @TILECACHE_PATH@ @JAILS_PATH@
 	@echo "Launching loolwsd under valgrind (but not forkit/loolkit, yet)"
 	@fc-cache "@LO_PATH@"/share/fonts/truetype
 	@cp $(abs_top_srcdir)/test/data/hello.odt $(abs_top_srcdir)/test/data/hello-world.odt
+	@cp $(abs_top_srcdir)/test/data/hello.ods $(abs_top_srcdir)/test/data/hello-world.ods
+	@cp $(abs_top_srcdir)/test/data/hello.odp $(abs_top_srcdir)/test/data/hello-world.odp
 	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 \
@@ -309,6 +313,8 @@ run-gdb: all @TILECACHE_PATH@ @JAILS_PATH@
 	@echo "Launching loolwsd under valgrind's callgrind"
 	@fc-cache "@LO_PATH@"/share/fonts/truetype
 	@cp $(abs_top_srcdir)/test/data/hello.odt $(abs_top_srcdir)/test/data/hello-world.odt
+	@cp $(abs_top_srcdir)/test/data/hello.ods $(abs_top_srcdir)/test/data/hello-world.ods
+	@cp $(abs_top_srcdir)/test/data/hello.odp $(abs_top_srcdir)/test/data/hello-world.odp
 	gdb --tui --args \
 		./loolwsd --o:security.capabilities="false" \
 			  --o:sys_template_path="@SYSTEMPLATE_PATH@" --o:lo_template_path="@LO_PATH@" \
@@ -324,6 +330,8 @@ run-callgrind: all @TILECACHE_PATH@ @JAILS_PATH@
 	@echo "Launching loolwsd under valgrind's callgrind"
 	@fc-cache "@LO_PATH@"/share/fonts/truetype
 	@cp $(abs_top_srcdir)/test/data/hello.odt $(abs_top_srcdir)/test/data/hello-world.odt
+	@cp $(abs_top_srcdir)/test/data/hello.ods $(abs_top_srcdir)/test/data/hello-world.ods
+	@cp $(abs_top_srcdir)/test/data/hello.odp $(abs_top_srcdir)/test/data/hello-world.odp
 	valgrind --tool=callgrind --simulate-cache=yes --dump-instr=yes --num-callers=50 --error-limit=no --trace-children=yes \
 		./loolwsd --o:security.capabilities="false" \
 			  --o:sys_template_path="@SYSTEMPLATE_PATH@" --o:lo_template_path="@LO_PATH@" \
@@ -339,6 +347,8 @@ run-strace: all @TILECACHE_PATH@ @JAILS_PATH@
 	@echo "Launching loolwsd under strace"
 	@fc-cache "@LO_PATH@"/share/fonts/truetype
 	@cp $(abs_top_srcdir)/test/data/hello.odt $(abs_top_srcdir)/test/data/hello-world.odt
+	@cp $(abs_top_srcdir)/test/data/hello.ods $(abs_top_srcdir)/test/data/hello-world.ods
+	@cp $(abs_top_srcdir)/test/data/hello.odp $(abs_top_srcdir)/test/data/hello-world.odp
 	strace -o strace.log -f -tt -s 256 \
 		./loolwsd --o:security.capabilities="false" \
 			  --o:sys_template_path="@SYSTEMPLATE_PATH@" --o:lo_template_path="@LO_PATH@" \
diff --git a/test/data/hello-world.odp b/test/data/hello-world.odp
deleted file mode 100644
index 774b8e3c9..000000000
Binary files a/test/data/hello-world.odp and /dev/null differ
diff --git a/test/data/hello-world.ods b/test/data/hello-world.ods
deleted file mode 100644
index eccadf96a..000000000
Binary files a/test/data/hello-world.ods and /dev/null differ
diff --git a/test/data/hello.odp b/test/data/hello.odp
new file mode 100644
index 000000000..91d75c8b0
Binary files /dev/null and b/test/data/hello.odp differ
diff --git a/test/data/hello.ods b/test/data/hello.ods
new file mode 100644
index 000000000..f92a6ba26
Binary files /dev/null and b/test/data/hello.ods differ
commit 455cd4092ea7ba04f521137cbd0e9292a2d4cce8
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu Nov 1 11:22:59 2018 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Nov 1 11:39:30 2018 +0100

    chmod -x on test data files
    
    Change-Id: I398d75b298c86a231a76b7903f792b886450b128
    Reviewed-on: https://gerrit.libreoffice.org/62724
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/test/data/corrupted.odt b/test/data/corrupted.odt
old mode 100755
new mode 100644
diff --git a/test/data/empty.odg b/test/data/empty.odg
old mode 100755
new mode 100644
diff --git a/test/data/empty.odp b/test/data/empty.odp
old mode 100755
new mode 100644
diff --git a/test/data/empty.ods b/test/data/empty.ods
old mode 100755
new mode 100644
diff --git a/test/data/empty.odt b/test/data/empty.odt
old mode 100755
new mode 100644
diff --git a/test/data/viewcursor.odp b/test/data/viewcursor.odp
old mode 100755
new mode 100644