diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2020-12-08 13:46:18 +0100 |
|---|---|---|
| committer | Tamás Zolnai <zolnaitamas2000@gmail.com> | 2020-12-08 14:24:18 +0100 |
| commit | 742266323471044e9952c776e2607e8dbcdb11b5 (patch) | |
| tree | d40becf05b33bd75225d28e2d0cabcdc9ee8e846 | |
| parent | cypress: add 'run-interfer-mobile' make command. (diff) | |
| download | online-742266323471044e9952c776e2607e8dbcdb11b5.tar.gz online-742266323471044e9952c776e2607e8dbcdb11b5.zip | |
cypress: put loolwsd log under cypress_test/workdir folder.
So it's easier to find the loolwsd.log of the last
called command.
Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Change-Id: I4d597a3d6683360ef03f15061a68a30db8ae498e
| -rw-r--r-- | cypress_test/Makefile.am | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am index 128ab04d36..790a5afe5e 100644 --- a/cypress_test/Makefile.am +++ b/cypress_test/Makefile.am @@ -13,6 +13,7 @@ PARALLEL_SCRIPT = $(abs_srcdir)/run_parallel.sh PID_FILE=$(abs_builddir)/workdir/loolwsd.pid ERROR_LOG=$(abs_builddir)/workdir/error.log +LOOLWSD_LOG=$(abs_builddir)/workdir/loolwsd.log SUPPORT_FILE_ABS = $(abs_srcdir)/support/index.js SUPPORT_FILE = $(if $(findstring $(abs_srcdir),$(abs_builddir)),support/index.js,$(SUPPORT_FILE_ABS)) @@ -86,6 +87,7 @@ do-check: $(DESKTOP_TEST_FILES_DONE) $(MOBILE_TEST_FILES_DONE) $(MULTIUSER_TESTS $(PID_FILE): @JAILS_PATH@ $(NODE_BINS) @rm -f $(ERROR_LOG) + @rm -f $(LOOLWSD_LOG) $(call run_JS_error_check) $(if $(HEADLESS_BUILD),$(call start_Xvfb),) $(call start_loolwsd) @@ -115,12 +117,14 @@ $(MULTIUSER_TESTS_DONE): $(PID_FILE) $(MOBILE_TEST_FILES_DONE) @mkdir -p $(dir $@) && touch $@ check-desktop: @JAILS_PATH@ $(NODE_BINS) + @rm -f $(LOOLWSD_LOG) $(call run_JS_error_check) $(call start_loolwsd) $(call run_desktop_tests,$(spec)) @$(KILL_COMMAND) || true check-mobile: @JAILS_PATH@ $(NODE_BINS) + @rm -f $(LOOLWSD_LOG) $(call run_JS_error_check) $(call start_loolwsd) $(call run_mobile_tests,$(spec)) @@ -134,6 +138,7 @@ do-multi-check-log: do-multi-check do-multi-check: @JAILS_PATH@ $(NODE_BINS) @rm -f $(ERROR_LOG) + @rm -f $(LOOLWSD_LOG) $(call run_JS_error_check) $(call start_loolwsd) $(if $(spec), \ @@ -149,6 +154,7 @@ do-interfer-mobile-check-log: do-interfer-mobile-check do-interfer-mobile-check: @JAILS_PATH@ $(NODE_BINS) @rm -f $(ERROR_LOG) + @rm -f $(LOOLWSD_LOG) $(call run_JS_error_check) $(call start_loolwsd) $(if $(spec), \ @@ -157,6 +163,7 @@ do-interfer-mobile-check: @JAILS_PATH@ $(NODE_BINS) @$(KILL_COMMAND) || true run-desktop: @JAILS_PATH@ $(NODE_BINS) + @rm -f $(LOOLWSD_LOG) $(call run_JS_error_check) $(call start_loolwsd) @echo @@ -166,6 +173,7 @@ run-desktop: @JAILS_PATH@ $(NODE_BINS) @$(KILL_COMMAND) || true run-mobile: @JAILS_PATH@ $(NODE_BINS) + @rm -f $(LOOLWSD_LOG) $(call run_JS_error_check) $(call start_loolwsd) @echo @@ -175,6 +183,7 @@ run-mobile: @JAILS_PATH@ $(NODE_BINS) @$(KILL_COMMAND) || true run-multi: @JAILS_PATH@ $(NODE_BINS) + @rm -f $(LOOLWSD_LOG) $(call run_JS_error_check) $(call start_loolwsd) @echo @@ -198,6 +207,7 @@ run-multi: @JAILS_PATH@ $(NODE_BINS) @$(KILL_COMMAND) || true run-interfer-mobile: @JAILS_PATH@ $(NODE_BINS) + @rm -f $(LOOLWSD_LOG) $(call run_JS_error_check) $(call start_loolwsd) @echo @@ -269,6 +279,7 @@ define start_loolwsd --o:logging.file[@enable]=true --o:logging.level=trace \ --port=$(FREE_PORT) \ --pidfile=$(PID_FILE) \ + --o:logging.file.property[0]=$(LOOLWSD_LOG) \ $(if $(findstring php-proxy, $(CYPRESS_INTEGRATION)),--o:net.proxy_prefix=true) \ > /dev/null 2>&1 & @$(WAIT_ON_BINARY) http://localhost:$(FREE_PORT) --timeout 60000 |