[Libreoffice-commits] core.git: extensions/CustomTarget_automationtest.mk extensions/qa

[Tor Lillqvist]

 extensions/CustomTarget_automationtest.mk |    9 ++++++---
 extensions/qa/ole/automationtest.vbs      |    5 +++++
 2 files changed, 11 insertions(+), 3 deletions(-)

New commits:
commit ff7e2868d61f2958ec86fbd53bb3e2957ca3da39
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu May 31 19:06:04 2018 +0300

    Run soffice frpm instdir (but CustomTarget_automationtest still can't work)
    
    WScript.CreateObject() takes the symbolic name of the object class
    that it then looks up from the Registry to find the CLSID of the
    class. I don't really know how we could make this unit test work at
    build time. Keep it still commented out in the module makefile.
    
    Change-Id: I73418754db9ccc3f5d384754d4d3be74ae1f9dca

diff --git a/extensions/CustomTarget_automationtest.mk b/extensions/CustomTarget_automationtest.mk
index b1984d98d153..1c115b09a8b5 100644
--- a/extensions/CustomTarget_automationtest.mk
+++ b/extensions/CustomTarget_automationtest.mk
@@ -11,14 +11,17 @@ $(eval $(call gb_CustomTarget_CustomTarget,extensions/automationtest))
 
 extensions_AUTOMATIONTESTDIR := $(call gb_CustomTarget_get_workdir,extensions/automationtest)
 
-extensions_AUTOMATIONTESTLOG := $(extensions_AUTOMATIONTESTDIR)/automationtest.log
+extensions_AUTOMATIONTESTLOG1 := $(extensions_AUTOMATIONTESTDIR)/automationtest.1.log
+extensions_AUTOMATIONTESTLOG2 := $(extensions_AUTOMATIONTESTDIR)/automationtest.2.log
 
 $(call gb_CustomTarget_get_target,extensions/automationtest) : \
 		$(SRCDIR)/extensions/qa/ole/automationtest.vbs \
 		| $(extensions_AUTOMATIONTESTDIR)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),VBS,1) \
+	SAL_LOG=+INFO.extensions.olebridge+WARN $(INSTDIR)/program/soffice 2>$(extensions_AUTOMATIONTESTLOG1) &
+	sleep 10
 	$(call gb_Helper_abbreviate_dirs, \
-	cscript -nologo $(SRCDIR)/extensions/qa/ole/automationtest.vbs $(SRCDIR)) >$(extensions_AUTOMATIONTESTLOG) || \
-            (cat $(extensions_AUTOMATIONTESTLOG) && exit 1)
+	cscript -nologo $(SRCDIR)/extensions/qa/ole/automationtest.vbs $(SRCDIR)) >$(extensions_AUTOMATIONTESTLOG2) || \
+            (cat $(extensions_AUTOMATIONTESTLOG1) $(extensions_AUTOMATIONTESTLOG2) && exit 1)
 
 # vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/extensions/qa/ole/automationtest.vbs b/extensions/qa/ole/automationtest.vbs
index efd4b8a60eda..9b5dff05e957 100644
--- a/extensions/qa/ole/automationtest.vbs
+++ b/extensions/qa/ole/automationtest.vbs
@@ -81,6 +81,11 @@ WScript.Echo "Running Automation client tests"
 
 On Error Resume Next
 
+' FIXME: How can we ever make this work specifically with the
+' LibreOffice in instdir, when WScript.CreateObject() wants the
+' symbolic name that it then looks up from the Registry to find the
+' CLSID of the class?
+
 CheckErrorFatal "Set writer = WScript.CreateObject(""Writer.Application"")"
 CheckErrorFatal "writer.Visible = True"
 CheckErrorFatal "writer.Caption = ""=== This is Writer ==="""